comparison src/madplug/plugin.c @ 1361:f8b498451a84

- Fixed a bug that would crash Audacious when reloading plugins
author mf0102 <0102@gmx.at>
date Tue, 24 Jul 2007 21:50:17 +0200
parents 4b07404814ca
children f751510a09ff
comparison
equal deleted inserted replaced
1340:7bb2692b3be9 1361:f8b498451a84
53 #endif 53 #endif
54 54
55 extern gboolean scan_file(struct mad_info_t *info, gboolean fast); 55 extern gboolean scan_file(struct mad_info_t *info, gboolean fast);
56 56
57 static gint mp3_bitrate_table[5][16] = { 57 static gint mp3_bitrate_table[5][16] = {
58 { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 }, /* MPEG1 L1 */ 58 { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 }, /* MPEG1 L1 */
59 { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 }, /* MPEG1 L2 */ 59 { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 }, /* MPEG1 L2 */
60 { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 }, /* MPEG1 L3 */ 60 { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 }, /* MPEG1 L3 */
61 { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 }, /* MPEG2(.5) L1 */ 61 { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 }, /* MPEG2(.5) L1 */
62 { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 } /* MPEG2(.5) L2,L3 */ 62 { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 } /* MPEG2(.5) L2,L3 */
63 }; 63 };
64 64
65 static gint mp3_samplerate_table[4][4] = { 65 static gint mp3_samplerate_table[4][4] = {
66 { 11025, 12000, 8000, -1 }, /* MPEG2.5 */ 66 { 11025, 12000, 8000, -1 }, /* MPEG2.5 */
67 { -1, -1, -1, -1 }, /* Reserved */ 67 { -1, -1, -1, -1 }, /* Reserved */
68 { 22050, 24000, 16000, -1 }, /* MPEG2 */ 68 { 22050, 24000, 16000, -1 }, /* MPEG2 */
69 { 44100, 48000, 32000, -1 } /* MPEG1 */ 69 { 44100, 48000, 32000, -1 } /* MPEG1 */
70 }; 70 };
71 71
72 /* 72 /*
73 * Function extname (filename) 73 * Function extname (filename)
74 * 74 *
184 { 184 {
185 g_free(audmad_config.pregain_db); 185 g_free(audmad_config.pregain_db);
186 g_free(audmad_config.replaygain.default_db); 186 g_free(audmad_config.replaygain.default_db);
187 g_free(audmad_config.id3_format); 187 g_free(audmad_config.id3_format);
188 188
189 audmad_config.pregain_db = NULL;
190 audmad_config.replaygain.default_db = NULL;
191 audmad_config.id3_format = NULL;
192
189 g_cond_free(mad_cond); 193 g_cond_free(mad_cond);
190 g_mutex_free(mad_mutex); 194 g_mutex_free(mad_mutex);
191 g_mutex_free(pb_mutex); 195 g_mutex_free(pb_mutex);
192 } 196 }
193 197
568 572
569 if (aboutbox != NULL) 573 if (aboutbox != NULL)
570 return; 574 return;
571 575
572 scratch = g_strdup_printf( 576 scratch = g_strdup_printf(
573 _("Audacious MPEG Audio Plugin\n" 577 _("Audacious MPEG Audio Plugin\n"
574 "\n" 578 "\n"
575 "Compiled against libMAD version: %d.%d.%d%s\n" 579 "Compiled against libMAD version: %d.%d.%d%s\n"
576 "\n" 580 "\n"
577 "Written by:\n" 581 "Written by:\n"
578 " William Pitcock <nenolod@sacredspiral.co.uk>\n" 582 " William Pitcock <nenolod@sacredspiral.co.uk>\n"
579 " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n" 583 " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
580 "\n" 584 "\n"
581 "Portions derived from XMMS-MAD by:\n" 585 "Portions derived from XMMS-MAD by:\n"
582 " Sam Clegg\n" 586 " Sam Clegg\n"
583 "\n" 587 "\n"
584 "ReplayGain support by:\n" 588 "ReplayGain support by:\n"
585 " Samuel Krempp"), 589 " Samuel Krempp"),
586 MAD_VERSION_MAJOR, MAD_VERSION_MINOR, MAD_VERSION_PATCH, 590 MAD_VERSION_MAJOR, MAD_VERSION_MINOR, MAD_VERSION_PATCH,
587 MAD_VERSION_EXTRA); 591 MAD_VERSION_EXTRA);
588 592
589 aboutbox = xmms_show_message(_("About MPEG Audio Plugin"), 593 aboutbox = xmms_show_message(_("About MPEG Audio Plugin"),
590 scratch, 594 scratch,
591 _("Ok"), FALSE, NULL, NULL); 595 _("Ok"), FALSE, NULL, NULL);
592 596