diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 19:17:55 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 19:17:55 +0100 |
| commit | f25590daf55db51fbc52dd3fff4fdd75324b8dee (patch) | |
| tree | 4ba2780e499e8bcc96a2a09cf8edb3108bf8cf0c /plugins | |
| parent | 741ddabe59751f2ddbef716b6a3c481c2f7ab1a5 (diff) | |
do not reinit alsa upon entering preferences window
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/alsa/alsa.c | 2 | ||||
| -rw-r--r-- | plugins/gtkui/callbacks.c | 7 | ||||
| -rw-r--r-- | plugins/gtkui/deadbeef.glade | 2 | ||||
| -rw-r--r-- | plugins/gtkui/interface.c | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index d449651f..f2182fc6 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -570,11 +570,11 @@ palsa_callback (char *stream, int len) { static int palsa_configchanged (DB_event_t *ev, uintptr_t data) { - trace ("alsa: config option changed, restarting\n"); int alsa_resample = deadbeef->conf_get_int ("alsa.resample", 0); const char *alsa_soundcard = deadbeef->conf_get_str ("alsa_soundcard", "default"); if (alsa_resample != conf_alsa_resample || strcmp (alsa_soundcard, conf_alsa_soundcard)) { + trace ("alsa: config option changed, restarting\n"); deadbeef->sendmessage (M_REINIT_SOUND, 0, 0, 0); } return 0; diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 0510daa6..b6ae0acc 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -1560,6 +1560,13 @@ on_preferences_activate (GtkMenuItem *menuitem, // soundcard (output device) selection preferences_fill_soundcards (); + g_signal_connect ((gpointer) combobox, "changed", + G_CALLBACK (on_pref_output_plugin_changed), + NULL); + GtkWidget *pref_soundcard = lookup_widget (prefwin, "pref_soundcard"); + g_signal_connect ((gpointer) pref_soundcard, "changed", + G_CALLBACK (on_pref_soundcard_changed), + NULL); // alsa resampling gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "pref_dynsamplerate")), deadbeef->conf_get_int ("playback.dynsamplerate", 0)); diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index c8a4e5a6..ac8680a1 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -1515,7 +1515,6 @@ <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> - <signal name="changed" handler="on_pref_output_plugin_changed" last_modification_time="Fri, 11 Dec 2009 21:05:28 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -1567,7 +1566,6 @@ <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> - <signal name="changed" handler="on_pref_soundcard_changed" last_modification_time="Sat, 07 Nov 2009 14:12:28 GMT"/> </widget> <packing> <property name="padding">0</property> diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index efa311c7..9caeaac0 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -1631,12 +1631,6 @@ create_prefwin (void) g_signal_connect ((gpointer) prefwin, "delete_event", G_CALLBACK (on_prefwin_delete_event), NULL); - g_signal_connect ((gpointer) pref_output_plugin, "changed", - G_CALLBACK (on_pref_output_plugin_changed), - NULL); - g_signal_connect ((gpointer) pref_soundcard, "changed", - G_CALLBACK (on_pref_soundcard_changed), - NULL); g_signal_connect ((gpointer) pref_dynsamplerate, "clicked", G_CALLBACK (on_pref_dynsamplerate_clicked), NULL); |