smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

fix problem exposed by GTK 2.11.6 with connecting to ComboBox::signal_changed(), and removed duplicate Export item from actiong group

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2212 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-08-01 16:19:42 +00:00
parent 6f352d9864
commit 3ebc1eea5e
5 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/ardour_ui2.cc
View file

@ -835,7 +835,10 @@ void
ARDOUR_UI::sync_option_changed () ARDOUR_UI::sync_option_changed ()
{ {
if (session) { 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));
}
} }
} }

1
gtk2_ardour/ardour_ui_ed.cc
View file

@ -80,7 +80,6 @@ ARDOUR_UI::install_actions ()
/* menus + submenus that need action items */ /* menus + submenus that need action items */
ActionManager::register_action (main_actions, X_("Session"), _("Session")); 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_("Cleanup"), _("Cleanup"));
ActionManager::register_action (main_actions, X_("Sync"), _("Sync")); ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
ActionManager::register_action (main_actions, X_("Options"), _("Options")); ActionManager::register_action (main_actions, X_("Options"), _("Options"));

2
gtk2_ardour/ardour_ui_options.cc
View file

@ -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 (MTC));
} }
positional_sync_strings.push_back (slave_source_to_string (JACK)); positional_sync_strings.push_back (slave_source_to_string (JACK));
set_popdown_strings (sync_option_combo, positional_sync_strings); set_popdown_strings (sync_option_combo, positional_sync_strings);
} }

1
libs/gtkmm2ext/utils.cc
View file

@ -18,6 +18,7 @@
$Id$ $Id$
*/ */
#include <iostream>
#include <map> #include <map>
#include <gtk/gtkpaned.h> #include <gtk/gtkpaned.h>

2
svn_revision.h
View file

@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__ #ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__ #define __ardour_svn_revision_h__
static const char* ardour_svn_revision = "2201"; static const char* ardour_svn_revision = "2209";
#endif #endif