projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix up mouseover handling in the port matrix.
[ardour.git] / gtk2_ardour / panner_ui.cc
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 2be7be73ed43398c0fe38449d21bf05858837939..728dfcbcfe246b66abf359ab4e92c67f07782b88 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -47,9 +47,8 @@ using namespace sigc;
 
 const int PannerUI::pan_bar_height = 30;
 
-PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
-       : _io (io),
-         _session (s),
+PannerUI::PannerUI (Session& s)
+       : _session (s),
          hAdjustment(0.0, 0.0, 0.0),
          vAdjustment(0.0, 0.0, 0.0),
          panning_viewport(hAdjustment, vAdjustment),
@@ -61,6 +60,8 @@ PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
 {
        ignore_toggle = false;
        pan_menu = 0;
+       pan_astate_menu = 0;
+       pan_astyle_menu = 0;
        in_pan_update = false;
 
        pan_automation_style_button.set_name ("MixerAutomationModeButton");
@@ -84,22 +85,6 @@ PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
        pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
        pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
 
-       using namespace Menu_Helpers;
-       pan_astate_menu.items().push_back (MenuElem (_("Manual"), 
-                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Off)));
-       pan_astate_menu.items().push_back (MenuElem (_("Play"),
-                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Play)));
-       pan_astate_menu.items().push_back (MenuElem (_("Write"),
-                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Write)));
-       pan_astate_menu.items().push_back (MenuElem (_("Touch"),
-                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Touch)));
-
-       pan_astyle_menu.items().push_back (MenuElem (_("Trim")));
-       pan_astyle_menu.items().push_back (MenuElem (_("Abs")));
-
-       pan_astate_menu.set_name ("ArdourContextMenu");
-       pan_astyle_menu.set_name ("ArdourContextMenu");
-
        pan_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &PannerUI::pan_automation_style_button_event), false);
        pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &PannerUI::pan_automation_state_button_event), false);
 
@@ -139,18 +124,39 @@ PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
        pack_start (pan_vbox, true, true);
 
        panner = 0;
+       big_window = 0;
 
        set_width(Narrow);
-
-       _io->panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed));
-       _io->panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage));
-       _io->panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state));
+}
+  
+void
+PannerUI::set_io (boost::shared_ptr<IO> io)
+{
+       connections.clear ();
+       
+       delete pan_astyle_menu;
+       pan_astyle_menu = 0;
+
+       delete pan_astate_menu;
+       pan_astate_menu = 0;
+                       
+       _io = io;
+ 
+       connections.push_back (_io->panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed)));
+       connections.push_back (_io->panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage)));
+       connections.push_back (_io->panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state)));
+ 
+       delete panner;
+       panner = 0;
+ 
+       setup_pan ();
 
        pan_changed (0);
        update_pan_sensitive ();
        update_pan_linkage ();
        pan_automation_state_changed ();
 
+#if WHERE_DOES_THIS_LIVE       
        pan_bar_packer.show();
        panning_viewport.show();
        panning_up.show();
@@ -164,6 +170,46 @@ PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
        pan_automation_style_button.show();
        pan_automation_state_button.show();
        show();
+#endif
+}
+
+void
+PannerUI::build_astate_menu ()
+{
+       using namespace Menu_Helpers;
+
+       if (pan_astate_menu == 0) {
+               pan_astate_menu = new Menu;
+               pan_astate_menu->set_name ("ArdourContextMenu");
+       } else {
+               pan_astate_menu->items().clear ();
+       }
+
+       pan_astate_menu->items().push_back (MenuElem (_("Manual"), 
+                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Off)));
+       pan_astate_menu->items().push_back (MenuElem (_("Play"),
+                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Play)));
+       pan_astate_menu->items().push_back (MenuElem (_("Write"),
+                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Write)));
+       pan_astate_menu->items().push_back (MenuElem (_("Touch"),
+                                                    bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Touch)));
+
+}
+
+void
+PannerUI::build_astyle_menu ()
+{
+       using namespace Menu_Helpers;
+
+       if (pan_astyle_menu == 0) {
+               pan_astyle_menu = new Menu;
+               pan_astyle_menu->set_name ("ArdourContextMenu");
+       } else {
+               pan_astyle_menu->items().clear();
+       }
+
+       pan_astyle_menu->items().push_back (MenuElem (_("Trim")));
+       pan_astyle_menu->items().push_back (MenuElem (_("Abs")));
 }
 
 boost::shared_ptr<PBD::Controllable>
@@ -175,14 +221,12 @@ PannerUI::get_controllable()
 bool
 PannerUI::panning_link_button_press (GdkEventButton* ev)
 {
-       cerr << "link press\n";
        return true;
 }
 
 bool
 PannerUI::panning_link_button_release (GdkEventButton* ev)
 {
-       cerr << "link release\n";
        if (!ignore_toggle) {
                _io->panner().set_linked (!_io->panner().linked());
        }
@@ -209,7 +253,7 @@ PannerUI::update_pan_linkage ()
        
        bool x = _io->panner().linked();
        bool bx = panning_link_button.get_active();
-       
+
        if (x != bx) {
                
                ignore_toggle = true;
@@ -255,14 +299,11 @@ PannerUI::~PannerUI ()
                delete (*i);
        }
 
-       if (panner) {
-               delete panner;
-       }
-
-       if (pan_menu) {
-               delete pan_menu;
-       }
-
+       delete panner;
+       delete big_window;
+       delete pan_menu;
+       delete pan_astyle_menu;
+       delete pan_astate_menu;
 }
 
 
@@ -271,6 +312,7 @@ PannerUI::panner_changed ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed));
        setup_pan ();
+       pan_changed (0);
 }
 
 void
@@ -380,10 +422,17 @@ PannerUI::setup_pan ()
                        panner = new Panner2d (_io->panner(), 61);
                        panner->set_name ("MixerPanZone");
                        panner->show ();
+
+ 
+                       panner->signal_button_press_event().connect
+                               (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) 0), false);
                }
                
                update_pan_sensitive ();
                panner->reset (_io->n_inputs().n_audio());
+               if (big_window) {
+                       big_window->reset (_io->n_inputs().n_audio());
+               }
                panner->set_size_request (-1, 61);
 
                /* and finally, add it to the panner frame */
@@ -398,6 +447,16 @@ bool
 PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which)
 {
        switch (ev->button) {
+       case 1:
+               if (panner && ev->type == GDK_2BUTTON_PRESS) {
+                       if (!big_window) {
+                               big_window = new Panner2dWindow (panner->get_panner(), 400, _io->n_inputs().n_audio());
+                       }
+                       big_window->show ();
+                       return true;
+               }
+               break;
+
        case 3:
                if (pan_menu == 0) {
                        pan_menu = manage (new Menu);
@@ -516,6 +575,7 @@ PannerUI::pan_changed (void *src)
                break;
 
        case 2:
+               /* bring pan bar state up to date */
                update_pan_bars (false);
                break;
 
@@ -630,7 +690,7 @@ PannerUI::pan_printer (char *buf, uint32_t len, Adjustment* adj)
 }
 
 void
-PannerUI::update_pan_sensitive ()
+PannerUI::update_pan_sensitive () 
 {
        bool sensitive = !(_io->panner().automation_state() & Play);
 
@@ -647,6 +707,9 @@ PannerUI::update_pan_sensitive ()
                if (panner) {
                        panner->set_sensitive (sensitive);
                }
+               if (big_window) {
+                       big_window->set_sensitive (sensitive);
+               }
                break;
        }
 }
@@ -662,7 +725,10 @@ PannerUI::pan_automation_state_button_event (GdkEventButton *ev)
 
        switch (ev->button) {
        case 1:
-               pan_astate_menu.popup (1, ev->time);
+               if (pan_astate_menu == 0) {
+                       build_astate_menu ();
+               }
+               pan_astate_menu->popup (1, ev->time);
                break;
        default:
                break;
@@ -680,7 +746,10 @@ PannerUI::pan_automation_style_button_event (GdkEventButton *ev)
 
        switch (ev->button) {
        case 1:
-               pan_astyle_menu.popup (1, ev->time);
+               if (pan_astyle_menu == 0) {
+                       build_astyle_menu ();
+               }
+               pan_astyle_menu->popup (1, ev->time);
                break;
        default:
                break;
@@ -743,7 +812,7 @@ PannerUI::pan_automation_state_changed ()
        pan_watching.disconnect();
 
        if (x) {
-         pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display));
+               pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display));
        }
 }
 
Unnamed repository; edit this file 'description' to name the repository.