|
 |
9b8c080 |
diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/configure.c audacious-plugin-fc-0.6-aud40/src/configure.c
|
|
|
9b8c080 |
--- audacious-plugin-fc-0.6-aud38/src/configure.c 2012-06-18 14:08:35.138165744 +0200
|
|
|
9b8c080 |
+++ audacious-plugin-fc-0.6-aud40/src/configure.c 2012-06-18 14:01:54.000000000 +0200
|
|
|
9b8c080 |
@@ -134,11 +134,8 @@
|
|
|
9b8c080 |
};
|
|
|
9b8c080 |
|
|
|
9b8c080 |
PluginPreferences fc_ip_preferences = {
|
|
|
9b8c080 |
- .domain = "fc14audiodecoder",
|
|
|
9b8c080 |
- .title = "Future Composer Decoder Configuration",
|
|
|
9b8c080 |
- .prefs = prefs,
|
|
|
9b8c080 |
- .n_prefs = G_N_ELEMENTS(prefs),
|
|
|
9b8c080 |
- .type = PREFERENCES_WINDOW,
|
|
|
9b8c080 |
+ .widgets = prefs,
|
|
|
9b8c080 |
+ .n_widgets = G_N_ELEMENTS(prefs),
|
|
|
9b8c080 |
.init = configure_init,
|
|
|
9b8c080 |
.apply = configure_apply,
|
|
|
9b8c080 |
};
|
|
|
9b8c080 |
diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/main.c audacious-plugin-fc-0.6-aud40/src/main.c
|
|
|
9b8c080 |
--- audacious-plugin-fc-0.6-aud38/src/main.c 2012-06-18 14:08:33.203270001 +0200
|
|
|
9b8c080 |
+++ audacious-plugin-fc-0.6-aud40/src/main.c 2012-06-18 14:05:11.000000000 +0200
|
|
|
9b8c080 |
@@ -205,9 +205,6 @@
|
|
|
9b8c080 |
if ( fc14dec_song_end(decoder) && jumpToTime<0 ) {
|
|
|
9b8c080 |
stop_flag = TRUE;
|
|
|
9b8c080 |
DRAIN:
|
|
|
9b8c080 |
- while ( !stop_flag && playback->output->buffer_playing() ) {
|
|
|
9b8c080 |
- g_usleep(20000);
|
|
|
9b8c080 |
- }
|
|
|
9b8c080 |
break;
|
|
|
9b8c080 |
}
|
|
|
9b8c080 |
}
|
|
|
9b8c080 |
@@ -217,7 +214,6 @@
|
|
|
9b8c080 |
g_cond_signal(seek_cond); /* wake up any waiting request */
|
|
|
9b8c080 |
g_mutex_unlock(seek_mutex);
|
|
|
9b8c080 |
|
|
|
9b8c080 |
- playback->output->close_audio();
|
|
|
9b8c080 |
g_free(sampleBuf);
|
|
|
9b8c080 |
fc14dec_delete(decoder);
|
|
|
9b8c080 |
return TRUE;
|
|
|
9b8c080 |
diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/plugin.c audacious-plugin-fc-0.6-aud40/src/plugin.c
|
|
|
9b8c080 |
--- audacious-plugin-fc-0.6-aud38/src/plugin.c 2012-06-18 14:08:35.140165668 +0200
|
|
|
9b8c080 |
+++ audacious-plugin-fc-0.6-aud40/src/plugin.c 2012-06-18 14:07:40.000000000 +0200
|
|
|
9b8c080 |
@@ -22,7 +22,7 @@
|
|
|
9b8c080 |
.name = "Future Composer decoder",
|
|
|
9b8c080 |
.init = ip_init,
|
|
|
9b8c080 |
.about = fc_ip_about,
|
|
|
9b8c080 |
- .settings = &fc_ip_preferences,
|
|
|
9b8c080 |
+ .prefs = &fc_ip_preferences,
|
|
|
9b8c080 |
.have_subtune = FALSE,
|
|
|
9b8c080 |
.extensions = fc_fmts,
|
|
|
9b8c080 |
.play = ip_play,
|