Merged up to trunk R732
[ardour.git] / gtk2_ardour / panner_ui.cc
index 5fc659d2f81dd534b23397e0974c377fc603bfa9..ccce2ec9f16ff1092ba66b4569ebb430abbbe280 100644 (file)
@@ -14,8 +14,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-  $Id$
 */
 
 #include <limits.h>
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace sigc;
 
 
-PannerUI::PannerUI (IO& io, Session& s)
+PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
        : _io (io),
          _session (s),
          hAdjustment(0.0, 0.0, 0.0),
@@ -68,8 +67,8 @@ PannerUI::PannerUI (IO& io, Session& s)
        ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("Pan automation mode"));
        ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type"));
 
-       set_size_request_to_display_given_text (pan_automation_state_button, X_("M"), 2, 2);
-       set_size_request_to_display_given_text (pan_automation_style_button, X_("M"), 2, 2);
+       //set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2);
+       //set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2);
 
        pan_bar_packer.set_size_request (-1, 61);
        panning_viewport.set_size_request (61, 61);
@@ -86,13 +85,13 @@ PannerUI::PannerUI (IO& io, Session& s)
 
        using namespace Menu_Helpers;
        pan_astate_menu.items().push_back (MenuElem (_("Off"), 
-                                                    bind (mem_fun (_io.panner(), &Panner::set_automation_state), (AutoState) Off)));
+                                                    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)));
+                                                    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)));
+                                                    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)));
+                                                    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")));
@@ -106,17 +105,13 @@ PannerUI::PannerUI (IO& io, Session& s)
        panning_link_button.set_name (X_("PanningLinkButton"));
        panning_link_direction_button.set_name (X_("PanningLinkDirectionButton"));
 
-       /* the pixmap will be reset at some point, but the key thing is that
-          we need a pixmap in the button just to get started.
-       */
-
-       Gtk::HBox* pan_button_hbox = manage (new Gtk::HBox());
-
        panning_link_box.pack_start (panning_link_button, true, true);
        panning_link_box.pack_start (panning_link_direction_button, true, true);
-       pan_button_hbox->pack_start (panning_link_box, true, true);
-       pan_button_hbox->pack_start (pan_automation_state_button, true, true);
+       panning_link_box.pack_start (pan_automation_state_button, true, true);
 
+       /* the pixmap will be reset at some point, but the key thing is that
+          we need a pixmap in the button just to get started.
+       */
        panning_link_direction_button.add (*(manage (new Image (get_xpm("forwardblarrow.xpm")))));
 
        panning_link_direction_button.signal_clicked().connect
@@ -138,7 +133,7 @@ PannerUI::PannerUI (IO& io, Session& s)
 
        pan_vbox.set_spacing (4);
        pan_vbox.pack_start (panning_viewport, Gtk::PACK_SHRINK);
-       pan_vbox.pack_start (*pan_button_hbox, Gtk::PACK_SHRINK);
+       pan_vbox.pack_start (panning_link_box, Gtk::PACK_SHRINK);
 
        pack_start (pan_vbox, true, false);
 
@@ -146,9 +141,9 @@ PannerUI::PannerUI (IO& io, Session& s)
 
        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));
+       _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));
 
        pan_changed (0);
        update_pan_sensitive ();
@@ -168,7 +163,7 @@ PannerUI::panning_link_button_release (GdkEventButton* ev)
 {
        cerr << "link release\n";
        if (!ignore_toggle) {
-               _io.panner().set_linked (!_io.panner().linked());
+               _io->panner().set_linked (!_io->panner().linked());
        }
        return true;
 }
@@ -176,12 +171,12 @@ PannerUI::panning_link_button_release (GdkEventButton* ev)
 void
 PannerUI::panning_link_direction_clicked()
 {
-       switch (_io.panner().link_direction()) {
+       switch (_io->panner().link_direction()) {
        case Panner::SameDirection:
-               _io.panner().set_link_direction (Panner::OppositeDirection);
+               _io->panner().set_link_direction (Panner::OppositeDirection);
                break;
        default:
-               _io.panner().set_link_direction (Panner::SameDirection);
+               _io->panner().set_link_direction (Panner::SameDirection);
                break;
        }
 }
@@ -191,7 +186,7 @@ PannerUI::update_pan_linkage ()
 {
        ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::update_pan_linkage));
        
-       bool x = _io.panner().linked();
+       bool x = _io->panner().linked();
        bool bx = panning_link_button.get_active();
        
        if (x != bx) {
@@ -203,7 +198,7 @@ PannerUI::update_pan_linkage ()
 
        panning_link_direction_button.set_sensitive (x);
 
-       switch (_io.panner().link_direction()) {
+       switch (_io->panner().link_direction()) {
        case Panner::SameDirection:
                panning_link_direction_button.set_image (*(manage (new Image (get_xpm ("forwardblarrow.xpm")))));
                break;
@@ -281,7 +276,7 @@ PannerUI::update_pan_state ()
 void
 PannerUI::setup_pan ()
 {
-       uint32_t nouts = _io.n_outputs ();
+       uint32_t nouts = _io->n_outputs ();
 
        if (nouts == 0 || nouts == 1) {
 
@@ -295,7 +290,7 @@ PannerUI::setup_pan ()
        } else if (nouts == 2) {
 
                vector<Adjustment*>::size_type asz;
-               uint32_t npans = _io.panner().size();
+               uint32_t npans = _io->panner().size();
 
                while (!pan_adjustments.empty()) {
                        delete pan_bars.back();
@@ -311,34 +306,26 @@ PannerUI::setup_pan ()
 
                        /* initialize adjustment with current value of panner */
 
-                       _io.panner()[asz]->get_position (x);
+                       _io->panner()[asz]->get_position (x);
 
                        pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.05, 0.1));
                        pan_adjustments.back()->signal_value_changed().connect (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
 
-                       _io.panner()[asz]->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
+                       _io->panner()[asz]->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
 
                        bc = new BarController (*pan_adjustments[asz], 
-                                               &_io.panner()[asz]->midi_control(),
+                                               _io->panner()[asz]->control(),
                                                bind (mem_fun(*this, &PannerUI::pan_printer), pan_adjustments[asz]));
                        
-                       if (_session.midi_port()) {
-                               _io.panner()[asz]->reset_midi_control (_session.midi_port(), true);
-                       }
-                       
                        bc->set_name ("PanSlider");
                        bc->set_shadow_type (Gtk::SHADOW_NONE);
                        bc->set_style (BarController::Line);
 
-                       bc->StartGesture.connect (bind (mem_fun (_io, &IO::start_pan_touch), (uint32_t) asz));
-                       bc->StopGesture.connect (bind (mem_fun (_io, &IO::end_pan_touch), (uint32_t) asz));
+                       bc->StartGesture.connect (bind (mem_fun (*_io, &IO::start_pan_touch), (uint32_t) asz));
+                       bc->StopGesture.connect (bind (mem_fun (*_io, &IO::end_pan_touch), (uint32_t) asz));
 
                        char buf[64];
-#ifdef __APPLE__
-                       snprintf (buf, sizeof (buf), _("panner for channel %lu"), asz + 1);
-#else
-                       snprintf (buf, sizeof (buf), _("panner for channel %u"), asz + 1);
-#endif
+                       snprintf (buf, sizeof (buf), _("panner for channel %zu"), asz + 1);
                        ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf);
 
                        bc->event_widget().signal_button_release_event().connect
@@ -382,13 +369,13 @@ PannerUI::setup_pan ()
                }
 
                if (panner == 0) {
-                       panner = new Panner2d (_io.panner(), w, 61);
+                       panner = new Panner2d (_io->panner(), w, 61);
                        panner->set_name ("MixerPanZone");
                        panner->show ();
                }
                
                update_pan_sensitive ();
-               panner->reset (_io.n_inputs());
+               panner->reset (_io->n_inputs());
                panner->set_size_request (w, 61);
 
                /* and finally, add it to the panner frame */
@@ -431,7 +418,7 @@ PannerUI::build_pan_menu (uint32_t which)
        
        /* set state first, connect second */
 
-       (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io.panner()[which]->muted());
+       (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io->panner()[which]->muted());
        (dynamic_cast<CheckMenuItem*> (&items.back()))->signal_toggled().connect
                (bind (mem_fun(*this, &PannerUI::pan_mute), which));
 
@@ -440,7 +427,7 @@ PannerUI::build_pan_menu (uint32_t which)
 
        /* set state first, connect second */
 
-       bypass_menu_item->set_active (_io.panner().bypassed());
+       bypass_menu_item->set_active (_io->panner().bypassed());
        bypass_menu_item->signal_toggled().connect (mem_fun(*this, &PannerUI::pan_bypass_toggle));
 
        items.push_back (MenuElem (_("Reset"), mem_fun(*this, &PannerUI::pan_reset)));
@@ -451,15 +438,15 @@ PannerUI::build_pan_menu (uint32_t which)
 void
 PannerUI::pan_mute (uint32_t which)
 {
-       StreamPanner* sp = _io.panner()[which];
+       StreamPanner* sp = _io->panner()[which];
        sp->set_muted (!sp->muted());
 }
 
 void
 PannerUI::pan_bypass_toggle ()
 {
-       if (bypass_menu_item && (_io.panner().bypassed() != bypass_menu_item->get_active())) {
-               _io.panner().set_bypassed (!_io.panner().bypassed());
+       if (bypass_menu_item && (_io->panner().bypassed() != bypass_menu_item->get_active())) {
+               _io->panner().set_bypassed (!_io->panner().bypassed());
        }
 }
 
@@ -471,11 +458,11 @@ PannerUI::pan_reset ()
 void
 PannerUI::effective_pan_display ()
 {
-       if (_io.panner().empty()) {
+       if (_io->panner().empty()) {
                return;
        }
 
-       switch (_io.n_outputs()) {
+       switch (_io->n_outputs()) {
        case 0: 
        case 1:
                /* relax */
@@ -498,18 +485,21 @@ PannerUI::pan_changed (void *src)
                return;
        }
 
-       switch (_io.panner().size()) {
+       switch (_io->panner().size()) {
        case 0:
-               panning_link_box.set_sensitive (false);
+               panning_link_direction_button.set_sensitive (false);
+               panning_link_button.set_sensitive (false);
                return;
        case 1:
-               panning_link_box.set_sensitive (false);
+               panning_link_direction_button.set_sensitive (false);
+               panning_link_button.set_sensitive (false);
                break;
        default:
-               panning_link_box.set_sensitive (true);
+               panning_link_direction_button.set_sensitive (true);
+               panning_link_button.set_sensitive (true);
        }
 
-       uint32_t nouts = _io.n_outputs();
+       uint32_t nouts = _io->n_outputs();
 
        switch (nouts) {
        case 0:
@@ -530,11 +520,11 @@ PannerUI::pan_changed (void *src)
 void
 PannerUI::pan_adjustment_changed (uint32_t which)
 {
-       if (!in_pan_update && which < _io.panner().size()) {
+       if (!in_pan_update && which < _io->panner().size()) {
 
                float xpos;
                float val = pan_adjustments[which]->get_value ();
-               _io.panner()[which]->get_position (xpos);
+               _io->panner()[which]->get_position (xpos);
 
                /* add a kinda-sorta detent for the middle */
                
@@ -551,7 +541,7 @@ PannerUI::pan_adjustment_changed (uint32_t which)
                
                if (!Panner::equivalent (val, xpos)) {
 
-                       _io.panner()[which]->set_position (val);
+                       _io->panner()[which]->set_position (val);
                        /* XXX 
                           the panner objects have no access to the session,
                           so do this here. ick.
@@ -566,11 +556,11 @@ PannerUI::pan_value_changed (uint32_t which)
 {
        ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which));
                                                           
-       if (_io.n_outputs() > 1 && which < _io.panner().size()) {
+       if (_io->n_outputs() > 1 && which < _io->panner().size()) {
                float xpos;
                float val = pan_adjustments[which]->get_value ();
 
-               _io.panner()[which]->get_position (xpos);
+               _io->panner()[which]->get_position (xpos);
 
                if (!Panner::equivalent (val, xpos)) {
                        in_pan_update = true;
@@ -596,14 +586,14 @@ PannerUI::update_pan_bars (bool only_if_aplay)
                float xpos, val;
 
                if (only_if_aplay) {
-                       AutomationList& alist (_io.panner()[n]->automation());
+                       AutomationList& alist (_io->panner()[n]->automation());
                        
                        if (!alist.automation_playback()) {
                                continue;
                        }
                }
 
-               _io.panner()[n]->get_effective_position (xpos);
+               _io->panner()[n]->get_effective_position (xpos);
                val = (*i)->get_value ();
                
                if (!Panner::equivalent (val, xpos)) {
@@ -634,9 +624,9 @@ PannerUI::pan_printer (char *buf, uint32_t len, Adjustment* adj)
 void
 PannerUI::update_pan_sensitive ()
 {
-       bool sensitive = !(_io.panner().automation_state() & Play);
+       bool sensitive = !(_io->panner().automation_state() & Play);
 
-       switch (_io.n_outputs()) {
+       switch (_io->n_outputs()) {
        case 0:
        case 1:
                break;
@@ -697,10 +687,10 @@ PannerUI::pan_automation_style_changed ()
        
        switch (_width) {
        case Wide:
-               pan_automation_style_button.set_label (astyle_string(_io.panner().automation_style()));
+               pan_automation_style_button.set_label (astyle_string(_io->panner().automation_style()));
                break;
        case Narrow:
-               pan_automation_style_button.set_label (short_astyle_string(_io.panner().automation_style()));
+               pan_automation_style_button.set_label (short_astyle_string(_io->panner().automation_style()));
                break;
        }
 }
@@ -714,10 +704,10 @@ PannerUI::pan_automation_state_changed ()
 
        switch (_width) {
        case Wide:
-         pan_automation_state_button.set_label (astate_string(_io.panner().automation_state()));
+         pan_automation_state_button.set_label (astate_string(_io->panner().automation_state()));
                break;
        case Narrow:
-         pan_automation_state_button.set_label (short_astate_string(_io.panner().automation_state()));
+         pan_automation_state_button.set_label (short_astate_string(_io->panner().automation_state()));
                break;
        }
 
@@ -726,11 +716,11 @@ PannerUI::pan_automation_state_changed ()
           here.
        */
 
-       if (_io.panner().empty()) {
+       if (_io->panner().empty()) {
                return;
        }
 
-       x = (_io.panner().front()->automation().automation_state() != Off);
+       x = (_io->panner().front()->automation().automation_state() != Off);
 
        if (pan_automation_state_button.get_active() != x) {
        ignore_toggle = true;