diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-08-01 16:19:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-08-01 16:19:42 +0000 |
| commit | 3ebc1eea5ec9a53324a0d23d0cf3e17ea31760e1 (patch) | |
| tree | 258864742d123cef8eef5e72d9af69a8d6dfc526 | |
| parent | 6f352d98642319c1d5c0d5302ba1dbd5db9c4bdb (diff) | |
fix problem exposed by GTK 2.11.6 with connecting to ComboBox::signal_changed(), and removed duplicate Export item from actiong group
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2212 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/utils.cc | 1 | ||||
| -rw-r--r-- | svn_revision.h | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index ff4b84467f..ad181653b5 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -835,7 +835,10 @@ void ARDOUR_UI::sync_option_changed () { if (session) { - session->request_slave_source (string_to_slave_source (sync_option_combo.get_active_text())); + ustring txt = sync_option_combo.get_active_text (); + if (txt.length()) { + session->request_slave_source (string_to_slave_source (txt)); + } } } diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index fbb700e20e..15cbc6d58f 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -80,7 +80,6 @@ ARDOUR_UI::install_actions () /* menus + submenus that need action items */ ActionManager::register_action (main_actions, X_("Session"), _("Session")); - ActionManager::register_action (main_actions, X_("Export"), _("Export")); ActionManager::register_action (main_actions, X_("Cleanup"), _("Cleanup")); ActionManager::register_action (main_actions, X_("Sync"), _("Sync")); ActionManager::register_action (main_actions, X_("Options"), _("Options")); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 4a6bef6b5f..e6a31d58cf 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -515,7 +515,7 @@ ARDOUR_UI::mtc_port_changed () positional_sync_strings.push_back (slave_source_to_string (MTC)); } positional_sync_strings.push_back (slave_source_to_string (JACK)); - + set_popdown_strings (sync_option_combo, positional_sync_strings); } diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 57661a05af..bae046bc46 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -18,6 +18,7 @@ $Id$ */ +#include <iostream> #include <map> #include <gtk/gtkpaned.h> diff --git a/svn_revision.h b/svn_revision.h index dbec20f285..4a1eb24c87 100644 --- a/svn_revision.h +++ b/svn_revision.h @@ -1,4 +1,4 @@ #ifndef __ardour_svn_revision_h__ #define __ardour_svn_revision_h__ -static const char* ardour_svn_revision = "2201"; +static const char* ardour_svn_revision = "2209"; #endif |