fix for playhead/edit cursor having wrong z-order placement; fix fader mouse control
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 11 Jul 2006 14:15:55 +0000 (14:15 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 11 Jul 2006 14:15:55 +0000 (14:15 +0000)
git-svn-id: svn://localhost/ardour2/trunk@676 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/ardour_ui.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_route_list.cc
libs/ardour/sndfilesource.cc
libs/gtkmm2ext/gtkmm2ext/slider_controller.h
libs/gtkmm2ext/slider_controller.cc
libs/libgnomecanvasmm/SConscript

index ce4a12f3301888b73304c12b86f28cc49d5ba7b6..833dc8512f490b059ea4acafd2d5e524ec7335a7 100644 (file)
@@ -374,11 +374,9 @@ ARDOUR_UI::finish()
        if (session && session->dirty()) {
                switch (ask_about_saving_session(_("quit"))) {
                case -1:
-                       cerr << "dialog return -1\n";
                        return;
                        break;
                case 1:
-                       cerr << "dialog return +1\n";
                        /* use the default name */
                        if (save_state_canfail ("")) {
                                /* failed - don't quit */
@@ -392,10 +390,7 @@ If you still wish to quit, please use the\n\n\
                        }
                        break;
                case 0:
-                       cerr << "dialog return 0\n";
                        break;
-               default:
-                       cerr << "dialog return other\n";
                }
        }
        Config->save_state();
index 41350a1da421142759d00e033f0ae31ba3176395..e8ba2b8a6032bce19af73d77172725eaa0e8070e 100644 (file)
@@ -128,7 +128,7 @@ Editor::initialize_canvas ()
        
        time_line_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0);
        cursor_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0);
-       
+
        time_canvas.set_name ("EditorTimeCanvas");
        time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK);
        time_canvas.set_flags (CAN_FOCUS);
index 2e036f500189ac98e9a2ec2afd172b2733fb4d9b..95ac35809504d66bba7eab4d67c593125810027b 100644 (file)
@@ -263,6 +263,10 @@ Editor::redisplay_route_list ()
                
        }
 
+       /* make sure the cursors stay on top of every newly added track */
+
+       cursor_group->raise_to_top ();
+
        reset_scrolling_region ();
 }
 
index b3ce33a2e62245108401039f3acbee44436101c7..118bdd77cfec7e262c86740596dec349ba3fad42 100644 (file)
@@ -244,7 +244,6 @@ SndFileSource::open ()
                /* if the file has data but no broadcast info, then clearly, there is no broadcast info */
 
                if (_length) {
-                       error << "SndFileSource: file has no broadcast info" << endmsg;
                        free (_broadcast_info);
                        _broadcast_info = 0;
                        _flags = Flag (_flags & ~Broadcast);
index 8054fdd1b7ae93a61dcea06b10e6f2a0c063d53f..f0f645eab7502b402c77344074aa378fb46efd17 100644 (file)
@@ -50,9 +50,7 @@ class SliderController : public Gtkmm2ext::PixScroller
 
        Gtk::SpinButton& get_spin_button () { return spin; }
        
-       bool on_button_press_event (GdkEventButton *ev) {
-               return binding_proxy.button_press_handler (ev);
-       }
+       bool on_button_press_event (GdkEventButton *ev);
 
   protected:
        BindingProxy binding_proxy;
index aba58724ebe92f0a8128c3acdad5c3e69e26e816..e524eba1cbd4bdd57010351bf3a10bf2feee1e5c 100644 (file)
@@ -50,6 +50,15 @@ SliderController::set_value (float v)
        adj.set_value (v);
 }
 
+bool 
+SliderController::on_button_press_event (GdkEventButton *ev) 
+{
+       if (binding_proxy.button_press_handler (ev)) {
+               return true;
+       }
+       return PixScroller::on_button_press_event (ev);
+}
+
 VSliderController::VSliderController (Glib::RefPtr<Gdk::Pixbuf> slide,
                                      Glib::RefPtr<Gdk::Pixbuf> rail,
                                      Gtk::Adjustment *adj,
index 1d5f3e0050874464dc004c9678ab4d2221b2dd88..d9620dc378eb597429f47f7ca15d6653c47cb153 100644 (file)
@@ -8,7 +8,14 @@ gnomecanvasmm_files = glob.glob('libgnomecanvasmm/*.cc')
 
 Import('env libraries install_prefix')
 gnomecanvasmm = env.Copy()
-gnomecanvasmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'], libraries['gtkmm2'], libraries['libgnomecanvas2'] ])
+gnomecanvasmm.Merge([libraries['glibmm2'],
+                     libraries['gtk2'],
+                     libraries['sigc2'],
+                     libraries['pangomm'],
+                     libraries['atkmm'],
+                     libraries['gdkmm2'],
+                     libraries['gtkmm2'],
+                     libraries['libgnomecanvas2'] ])
 
 libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files)
 Default(libgnomecanvasmm)