X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=202a55ee1d9298e3eb1a109ee70c581a016bfa3e;hb=b1c48972f2914b49d45a7cef2b38a0a125bd731e;hp=4d13367cb611182934f8a753ab844e1fcc6447af;hpb=14543eb1374dc51834385d2f3886f1e6068223c5;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 4d13367cb6..202a55ee1d 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
@@ -29,8 +28,8 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
+#include <gtkmm2ext/window_title.h>
 
-#include <ardour/audioengine.h>
 #include <ardour/session.h>
 #include <ardour/audio_track.h>
 #include <ardour/session_route.h>
@@ -59,16 +58,20 @@ using namespace std;
 
 using PBD::atoi;
 
-Mixer_UI::Mixer_UI (AudioEngine& eng)
-	: Window (Gtk::WINDOW_TOPLEVEL),
-	  engine (eng)
+Mixer_UI::Mixer_UI ()
+	: Window (Gtk::WINDOW_TOPLEVEL)
 {
-	_strip_width = Wide;
+	session = 0;
+	_strip_width = Config->get_default_narrow_ms() ? Narrow : Wide;
 	track_menu = 0;
 	mix_group_context_menu = 0;
 	no_track_list_redisplay = false;
 	in_group_row_change = false;
 	_visible = false;
+	ignore_route_reorder = false;
+	ignore_sync = false;
+
+	Route::SyncOrderKeys.connect (mem_fun (*this, &Mixer_UI::sync_order_keys));
 
  	scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
  	scroller_base.set_name ("MixerWindow");
@@ -94,6 +97,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
 
 	track_model->signal_row_deleted().connect (mem_fun (*this, &Mixer_UI::track_list_delete));
 	track_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::track_list_change));
+	track_model->signal_rows_reordered().connect (mem_fun (*this, &Mixer_UI::track_list_reorder));
 
 	CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (1));
 	track_list_visible_cell->property_activatable() = true;
@@ -196,15 +200,15 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
 	list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), 
 							 static_cast<Gtk::Paned*> (&list_hpane)));
 	
-
-	rhs_pane1.set_data ("collapse-direction", (gpointer) 0);
-	list_hpane.set_data ("collapse-direction", (gpointer) 1);
-
 	global_vpacker.pack_start (list_hpane, true, true);
 
 	add (global_vpacker);
 	set_name ("MixerWindow");
-	set_title (_("ardour: mixer"));
+	
+	WindowTitle title(Glib::get_application_name());
+	title += _("Mixer");
+	set_title (title.get_string());
+
 	set_wmclass (X_("ardour_mixer"), "Ardour");
 
 	add_accel_group (ActionManager::ui_manager->get_accel_group());
@@ -217,6 +221,33 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
 	signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
 
 	_selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
+
+	mix_group_display_button_box->show();
+	mix_group_add_button->show();
+	mix_group_remove_button->show();
+
+	global_hpacker.show();
+	global_vpacker.show();
+	scroller.show();
+	scroller_base.show();
+	scroller_hpacker.show();
+	mixer_scroller_vpacker.show();
+	list_vpacker.show();
+	group_display_button_label.show();
+	group_display_button.show();
+	track_display_scroller.show();
+	group_display_scroller.show();
+	group_display_vbox.show();
+	track_display_frame.show();
+	group_display_frame.show();
+	rhs_pane1.show();
+	strip_packer.show();
+	out_packer.show();
+	list_hpane.show();
+	track_display.show();
+	group_display.show();
+
+	auto_rebinding = FALSE;
 }
 
 Mixer_UI::~Mixer_UI ()
@@ -232,17 +263,20 @@ Mixer_UI::ensure_float (Window& win)
 void
 Mixer_UI::show_window ()
 {
-	show_all ();
-
-	/* now reset each strips width so the right widgets are shown */
-	MixerStrip* ms;
-
-	TreeModel::Children rows = track_model->children();
-	TreeModel::Children::iterator ri;
-
-	for (ri = rows.begin(); ri != rows.end(); ++ri) {
-		ms = (*ri)[track_columns.strip];
-		ms->set_width (ms->get_width());
+	present ();
+	if (!_visible) {
+		set_window_pos_and_size ();
+		
+		/* now reset each strips width so the right widgets are shown */
+		MixerStrip* ms;
+		
+		TreeModel::Children rows = track_model->children();
+		TreeModel::Children::iterator ri;
+		
+		for (ri = rows.begin(); ri != rows.end(); ++ri) {
+			ms = (*ri)[track_columns.strip];
+			ms->set_width (ms->get_width(), ms->width_owner());
+		}
 	}
 	_visible = true;
 }
@@ -250,6 +284,8 @@ Mixer_UI::show_window ()
 bool
 Mixer_UI::hide_window (GdkEventAny *ev)
 {
+	get_window_pos_and_size ();
+
 	_visible = false;
 	return just_hide_it(ev, static_cast<Gtk::Window *>(this));
 }
@@ -265,14 +301,21 @@ Mixer_UI::add_strip (Session::RouteList& routes)
 	for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
 		boost::shared_ptr<Route> route = (*x);
 
-		if (route->hidden()) {
+		if (route->is_hidden()) {
 			return;
 		}
 		
 		strip = new MixerStrip (*this, *session, route);
 		strips.push_back (strip);
 		
-		strip->set_width (_strip_width);
+		Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+
+		Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+
+		if (strip->width_owner() != strip) {
+			strip->set_width (_strip_width, this);
+		}
+
 		show_strip (strip);
 		
 		no_track_list_redisplay = true;
@@ -280,14 +323,16 @@ Mixer_UI::add_strip (Session::RouteList& routes)
 		TreeModel::Row row = *(track_model->append());
 		row[track_columns.text] = route->name();
 		
-		row[track_columns.visible] = true;
+		row[track_columns.visible] = strip->marked_for_display();
 		row[track_columns.route] = route;
 		row[track_columns.strip] = strip;
 		
+		strip->set_old_order_key (track_model->children().size() - 1);
+
 		no_track_list_redisplay = false;
 		redisplay_track_list ();
 		
-		route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
+		route->NameChanged.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
 		strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
 		
 		strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
@@ -298,7 +343,7 @@ void
 Mixer_UI::remove_strip (MixerStrip* strip)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-	
+
 	TreeModel::Children rows = track_model->children();
 	TreeModel::Children::iterator ri;
 	list<MixerStrip *>::iterator i;
@@ -307,6 +352,14 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 		strips.erase (i);
 	}
 
+	/* Decrement old order keys for strips `above' the one that is being removed */
+	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+		MixerStrip* s = (*ri)[track_columns.strip];
+		if (s->old_order_key() > strip->old_order_key()) {
+			s->set_old_order_key (s->old_order_key() - 1);
+		}
+	}
+
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
 		if ((*ri)[track_columns.strip] == strip) {
 			track_model->erase (ri);
@@ -315,6 +368,42 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 	}
 }
 
+const char*
+Mixer_UI::get_order_key() 
+{
+	if (Config->get_sync_all_route_ordering()) {
+		return X_("editor");
+	} else {
+		return X_("signal");
+	}
+}
+
+void
+Mixer_UI::sync_order_keys ()
+{
+	vector<int> neworder;
+	TreeModel::Children rows = track_model->children();
+	TreeModel::Children::iterator ri;
+
+	if (ignore_sync || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) {
+		return;
+	}
+
+	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+		neworder.push_back (0);
+	}
+
+	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+		boost::shared_ptr<Route> route = (*ri)[track_columns.route];
+		MixerStrip* strip = (*ri)[track_columns.strip];
+		neworder[route->order_key (get_order_key())] = strip->old_order_key ();
+	}
+
+	ignore_route_reorder = true;
+	track_model->reorder (neworder);
+	ignore_route_reorder = false;
+}
+
 void
 Mixer_UI::follow_strip_selection ()
 {
@@ -336,7 +425,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 		if (_selection.selected (strip->route())) {
 			_selection.remove (strip->route());
 		} else {
-			if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
+			if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
 				_selection.add (strip->route());
 			} else {
 				_selection.set (strip->route());
@@ -356,9 +445,11 @@ Mixer_UI::connect_to_session (Session* sess)
 	XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
 	set_state (*node);
 
-	string wintitle = _("ardour: mixer: ");
-	wintitle += session->name();
-	set_title (wintitle);
+	WindowTitle title(session->name());
+	title += _("Mixer");
+	title += Glib::get_application_name();
+
+	set_title (title.get_string());
 
 	initial_track_display ();
 
@@ -384,7 +475,12 @@ Mixer_UI::disconnect_from_session ()
 	ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session));
 	
 	group_model->clear ();
-	set_title (_("ardour: mixer"));
+	_selection.clear ();
+
+	WindowTitle title(Glib::get_application_name());
+	title += _("Mixer");
+	set_title (title.get_string());
+	
 	stop_updating ();
 }
 
@@ -461,7 +557,7 @@ Mixer_UI::set_all_strips_visibility (bool yn)
 			continue;
 		}
 		
-		if (strip->route()->master() || strip->route()->control()) {
+		if (strip->route()->is_master() || strip->route()->is_control()) {
 			continue;
 		}
 
@@ -489,11 +585,11 @@ Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
 			continue;
 		}
 
-		if (strip->route()->master() || strip->route()->control()) {
+		if (strip->route()->is_master() || strip->route()->is_control()) {
 			continue;
 		}
 
-		AudioTrack* at = strip->audio_track();
+		boost::shared_ptr<AudioTrack> at = strip->audio_track();
 
 		switch (tracks) {
 		case 0:
@@ -552,16 +648,27 @@ Mixer_UI::hide_all_audiotracks ()
 	set_all_audio_visibility (1, false);
 }
 
+void
+Mixer_UI::track_list_reorder (const TreeModel::Path& path, const TreeModel::iterator& iter, int* new_order)
+{
+	session->set_remote_control_ids();
+	redisplay_track_list ();
+}
+
 void
 Mixer_UI::track_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
 {
+	session->set_remote_control_ids();
 	redisplay_track_list ();
 }
 
 void
 Mixer_UI::track_list_delete (const Gtk::TreeModel::Path& path)
 {
+	session->set_remote_control_ids();
+	ignore_route_reorder = true;
 	redisplay_track_list ();
+	ignore_route_reorder = false;
 }
 
 void
@@ -589,9 +696,13 @@ Mixer_UI::redisplay_track_list ()
 			strip->set_marked_for_display (true);
 			strip->route()->set_order_key (N_("signal"), order);
 
+			if (!ignore_route_reorder) {
+				strip->route()->set_order_key (get_order_key(), order);
+			} 
+
 			if (strip->packed()) {
 
-				if (strip->route()->master() || strip->route()->control()) {
+				if (strip->route()->is_master() || strip->route()->is_control()) {
 					out_packer.reorder_child (*strip, -1);
 				} else {
 					strip_packer.reorder_child (*strip, -1); /* put at end */
@@ -599,31 +710,127 @@ Mixer_UI::redisplay_track_list ()
 
 			} else {
 
-				if (strip->route()->master() || strip->route()->control()) {
+				if (strip->route()->is_master() || strip->route()->is_control()) {
 					out_packer.pack_start (*strip, false, false);
 				} else {
 					strip_packer.pack_start (*strip, false, false);
 				}
 				strip->set_packed (true);
-				strip->show_all ();
+				//strip->show();
 			}
 
 		} else {
 
-			if (strip->route()->master() || strip->route()->control()) {
+			if (strip->route()->is_master() || strip->route()->is_control()) {
 				/* do nothing, these cannot be hidden */
 			} else {
-				strip_packer.remove (*strip);
-				strip->set_packed (false);
+				if (strip->packed()) {
+					strip_packer.remove (*strip);
+					strip->set_packed (false);
+				}
 			}
 		}
 	}
+	
+	if (Config->get_sync_all_route_ordering() && !ignore_route_reorder) {
+		ignore_sync = true;
+		Route::SyncOrderKeys (); // EMIT SIGNAL
+		ignore_sync = false;
+	}
+
+	// Rebind all of the midi controls automatically
+	
+	if (auto_rebinding)
+		auto_rebind_midi_controls ();
+
+}
+
+void
+Mixer_UI::set_auto_rebinding( bool val )
+{
+	if( val == TRUE )
+	{
+		auto_rebinding = TRUE;
+		Session::AutoBindingOff();
+	}
+	else
+	{
+		auto_rebinding = FALSE;
+		Session::AutoBindingOn();
+	}
+}
+
+void 
+Mixer_UI::toggle_auto_rebinding() 
+{
+	if (auto_rebinding)
+	{
+		set_auto_rebinding( FALSE );
+	}
+	
+	else
+	{
+		set_auto_rebinding( TRUE );
+	}
+
+	auto_rebind_midi_controls();
+}
+
+void 
+Mixer_UI::auto_rebind_midi_controls () 
+{
+	TreeModel::Children rows = track_model->children();
+	TreeModel::Children::iterator i;
+	int pos;
+
+	// Create bindings for all visible strips and remove those that are not visible
+	pos = 1;  // 0 is reserved for the master strip
+	for (i = rows.begin(); i != rows.end(); ++i) {
+		MixerStrip* strip = (*i)[track_columns.strip];
+    
+		if ( (*i)[track_columns.visible] == true ) {  // add bindings for
+			// make the actual binding
+			//cout<<"Auto Binding:  Visible Strip Found: "<<strip->name()<<endl;
+
+			int controlValue = pos;
+			if( strip->route()->is_master() ) {
+				controlValue = 0;
+			}
+			else {
+				pos++;
+			}
+
+			PBD::Controllable::CreateBinding ( strip->solo_button->get_controllable().get(), controlValue, 0);
+			PBD::Controllable::CreateBinding ( strip->mute_button->get_controllable().get(), controlValue, 1);
+
+			if( strip->is_audio_track() ) {
+				PBD::Controllable::CreateBinding ( strip->rec_enable_button->get_controllable().get(), controlValue, 2);
+			}
+
+			PBD::Controllable::CreateBinding ( strip->gpm.get_controllable().get(), controlValue, 3);
+			PBD::Controllable::CreateBinding ( strip->panners.get_controllable().get(), controlValue, 4);
+
+		}
+		else {  // Remove any existing binding
+			PBD::Controllable::DeleteBinding ( strip->solo_button->get_controllable().get() );
+			PBD::Controllable::DeleteBinding ( strip->mute_button->get_controllable().get() );
+
+			if( strip->is_audio_track() ) {
+				PBD::Controllable::DeleteBinding ( strip->rec_enable_button->get_controllable().get() );
+			}
+
+			PBD::Controllable::DeleteBinding ( strip->gpm.get_controllable().get() );
+			PBD::Controllable::DeleteBinding ( strip->panners.get_controllable().get() ); // This only takes the first panner if there are multiples...
+		}
+
+	} // for
+  
 }
 
 struct SignalOrderRouteSorter {
     bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
 	    /* use of ">" forces the correct sort order */
-	    return a->order_key ("signal") < b->order_key ("signal");
+	    return a->order_key (Mixer_UI::get_order_key()) < b->order_key (Mixer_UI::get_order_key());
     }
 };
 
@@ -686,7 +893,7 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev)
 			MixerStrip* strip = (*iter)[track_columns.strip];
 			if (strip) {
 
-				if (!strip->route()->master() && !strip->route()->control()) {
+				if (!strip->route()->is_master() && !strip->route()->is_control()) {
 					bool visible = (*iter)[track_columns.visible];
 					(*iter)[track_columns.visible] = !visible;
 				}
@@ -722,9 +929,9 @@ Mixer_UI::build_track_menu ()
 }
 
 void
-Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
+Mixer_UI::strip_name_changed (MixerStrip* mx)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
+	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), mx));
 	
 	TreeModel::Children rows = track_model->children();
 	TreeModel::Children::iterator i;
@@ -893,6 +1100,16 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
 	}
 
 	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
+
+	/* force an update of any mixer strips that are using this group,
+	   otherwise mix group names don't change in mixer strips 
+	*/
+
+	for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+		if ((*i)->mix_group() == group) {
+			(*i)->mix_group_changed(0);
+		}
+	}
 	
 	TreeModel::iterator i;
 	TreeModel::Children rows = group_model->children();
@@ -965,6 +1182,7 @@ Mixer_UI::mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::Tree
 	if (name != group->name()) {
 		group->set_name (name);
 	}
+
 }
 
 void
@@ -1004,7 +1222,7 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
 	using namespace Menu_Helpers;
 
 	if (Keyboard::is_context_menu_event (ev)) {
-		ARDOUR_UI::instance()->add_route();
+		ARDOUR_UI::instance()->add_route (this);
 		return true;
 	}
 
@@ -1017,41 +1235,46 @@ Mixer_UI::set_strip_width (Width w)
 	_strip_width = w;
 
 	for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
-		(*i)->set_width (w);
+		(*i)->set_width (w, this);
 	}
 }
 
+void
+Mixer_UI::set_window_pos_and_size ()
+{
+	resize (m_width, m_height);
+	move (m_root_x, m_root_y);
+}
+
+	void
+Mixer_UI::get_window_pos_and_size ()
+{
+	get_position(m_root_x, m_root_y);
+	get_size(m_width, m_height);
+}
 
 int
 Mixer_UI::set_state (const XMLNode& node)
 {
 	const XMLProperty* prop;
 	XMLNode* geometry;
-	Gdk::Geometry g;
-	int x, y, xoff, yoff;
 	
 	if ((geometry = find_named_node (node, "geometry")) == 0) {
 
-		g.base_width = default_width;
-		g.base_height = default_height;
-		x = 1;
-		y = 1;
-		xoff = 0;
-		yoff = 21;
+		m_width = default_width;
+		m_height = default_height;
+		m_root_x = 1;
+		m_root_y = 1;
 
 	} else {
 
-		g.base_width = atoi(geometry->property("x_size")->value().c_str());
-		g.base_height = atoi(geometry->property("y_size")->value().c_str());
-		x = atoi(geometry->property("x_pos")->value().c_str());
-		y = atoi(geometry->property("y_pos")->value().c_str());
-		xoff = atoi(geometry->property("x_off")->value().c_str());
-		yoff = atoi(geometry->property("y_off")->value().c_str());
+		m_width = atoi(geometry->property("x-size")->value().c_str());
+		m_height = atoi(geometry->property("y-size")->value().c_str());
+		m_root_x = atoi(geometry->property("x-pos")->value().c_str());
+		m_root_y = atoi(geometry->property("y-pos")->value().c_str());
 	}
 
-	set_geometry_hints (global_vpacker, g, Gdk::HINT_BASE_SIZE);
-	set_default_size(g.base_width, g.base_height);
-	move (x, y);
+	set_window_pos_and_size ();
 
 	if ((prop = node.property ("narrow-strips"))) {
 		if (prop->value() == "yes") {
@@ -1077,25 +1300,24 @@ Mixer_UI::get_state (void)
 
 	if (is_realized()) {
 		Glib::RefPtr<Gdk::Window> win = get_window();
-		
-		int x, y, xoff, yoff, width, height;
-		win->get_root_origin(x, y);
-		win->get_position(xoff, yoff);
-		win->get_size(width, height);
+	
+		get_window_pos_and_size ();
 
 		XMLNode* geometry = new XMLNode ("geometry");
 		char buf[32];
-		snprintf(buf, sizeof(buf), "%d", width);
+		snprintf(buf, sizeof(buf), "%d", m_width);
 		geometry->add_property(X_("x_size"), string(buf));
-		snprintf(buf, sizeof(buf), "%d", height);
+		snprintf(buf, sizeof(buf), "%d", m_height);
 		geometry->add_property(X_("y_size"), string(buf));
-		snprintf(buf, sizeof(buf), "%d", x);
+		snprintf(buf, sizeof(buf), "%d", m_root_x);
 		geometry->add_property(X_("x_pos"), string(buf));
-		snprintf(buf, sizeof(buf), "%d", y);
+		snprintf(buf, sizeof(buf), "%d", m_root_y);
 		geometry->add_property(X_("y_pos"), string(buf));
-		snprintf(buf, sizeof(buf), "%d", xoff);
+		
+		// written only for compatibility, they are not used.
+		snprintf(buf, sizeof(buf), "%d", 0);
 		geometry->add_property(X_("x_off"), string(buf));
-		snprintf(buf, sizeof(buf), "%d", yoff);
+		snprintf(buf, sizeof(buf), "%d", 0);
 		geometry->add_property(X_("y_off"), string(buf));
 
 		snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&rhs_pane1)->gobj()));
@@ -1129,8 +1351,8 @@ Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which)
 		width = default_width;
 		height = default_height;
 	} else {
-		width = atoi(geometry->property("x_size")->value());
-		height = atoi(geometry->property("y_size")->value());
+		width = atoi(geometry->property("x-size")->value());
+		height = atoi(geometry->property("y-size")->value());
 	}
 
 	if (which == static_cast<Gtk::Paned*> (&rhs_pane1)) {
@@ -1139,7 +1361,7 @@ Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which)
 			return;
 		}
 
-		if (!geometry || (prop = geometry->property("mixer_rhs_pane1_pos")) == 0) {
+		if (!geometry || (prop = geometry->property("mixer-rhs-pane1-pos")) == 0) {
 			pos = height / 3;
 			snprintf (buf, sizeof(buf), "%d", pos);
 		} else {
@@ -1156,7 +1378,7 @@ Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which)
 			return;
 		}
 
-		if (!geometry || (prop = geometry->property("mixer_list_hpane_pos")) == 0) {
+		if (!geometry || (prop = geometry->property("mixer-list-hpane-pos")) == 0) {
 			pos = 75;
 			snprintf (buf, sizeof(buf), "%d", pos);
 		} else {