more miscellaneous fixes to make things even nicer

git-svn-id: svn://localhost/trunk/ardour2@153 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 20 insertions, 27 deletions

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index c868530476..c6551095c8 100644
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -79,19 +79,20 @@ Editor::Cursor::set_position (jack_nframes_t frame)
 
 	current_frame = frame;
 
-	if (new_pos == points.front().get_x()) {
-
-		/* change in position is not visible, so just raise it */
-
-		canvas_item.raise_to_top();
-		return;
-	} 
-
-	points.front().set_x(new_pos);
-	points.back().set_x(new_pos);
+	if (new_pos != points.front().get_x()) {
+
+		points.front().set_x (new_pos);
+		points.back().set_x (new_pos);
+		
+		cerr << "new cursor points = "
+		     << points.front().get_x() << ',' << points.front().get_y()
+		     << " .. "
+		     << points.back().get_x() << ',' << points.back().get_y()
+		     << endl;
+		
+		canvas_item.property_points() = points;
+	}
 
-	// cerr << "set cursor2 al points, nc = " << points->num_points << endl;
-	canvas_item.property_points() = points;
 	canvas_item.raise_to_top();
 }
 
@@ -99,8 +100,7 @@ void
 Editor::Cursor::set_length (double units)
 {
 	length = units; 
-	points.back().set_x (points.front().get_y() + length);
-	// cerr << "set cursor3 al points, nc = " << points->num_points << endl;
+	points.back().set_y (points.front().get_y() + length);
 	canvas_item.property_points() = points;
 }
 
@@ -108,7 +108,6 @@ void
 Editor::Cursor::set_y_axis (double position)
 {
         points.front().set_y (position);
-	points.back().set_x (position + length);
-	// cerr << "set cursor4 al points, nc = " << points->num_points << endl;
+	points.back().set_y (position + length);
 	canvas_item.property_points() = points;
 }
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index c2bde2c72b..8074b12afd 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -122,11 +122,6 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
 	set_name ("ExportWindow");
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
 
-	add (vpacker);
-
-	vpacker.set_border_width (10);
-	vpacker.set_spacing (10);
-
 	file_selector = 0;
 	spec.running = false;
 
@@ -172,7 +167,7 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
 	track_scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
 	master_scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
 
-	vpacker.pack_start (file_frame, false, false);
+	get_vbox()->pack_start (file_frame, false, false);
 
 	hpacker.set_spacing (5);
 	hpacker.set_border_width (5);
@@ -196,13 +191,13 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
 		hpacker.pack_start (track_vpacker);
 	}
 
-	vpacker.pack_start (hpacker);
+	get_vbox()->pack_start (hpacker);
 	
 	track_selector_button.set_name ("EditorGTKButton");
 	track_selector_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::track_selector_button_click));
 
-	vpacker.pack_start (button_box, false, false);
-	vpacker.pack_start (progress_bar, false, false);
+	get_vbox()->pack_start (button_box, false, false);
+	get_vbox()->pack_start (progress_bar, false, false);
 
 	Gtkmm2ext::set_size_request_to_display_given_text (file_entry, X_("Kg/quite/a/reasonable/size/for/files/i/think"), 5, 8);
 
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 16343e55bc..12532fafd4 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -73,7 +73,6 @@ class ExportDialog : public ArdourDialog
 	PublicEditor&    editor;
 	ARDOUR::Session* session;
 	ARDOUR::AudioRegion* audio_region;
-	Gtk::VBox   vpacker;
 	Gtk::VBox   track_vpacker;
 	Gtk::HBox   hpacker;
 	Gtk::HBox   button_box;
diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 512695aad7..eb0e7e3203 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -102,7 +102,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
 	clear_map ();
 	select_connection.disconnect ();
 
-	model.clear ();
+	model->clear ();
 	
 	session->foreach_playlist (this, &PlaylistSelector::add_playlist_to_map);