projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update tranzport code
[ardour.git] / gtk2_ardour / route_time_axis.cc
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index c94d3d2e719c8af2f115082446d61b215d142871..f5f0f1dd103f1031c38e765b87601ead9f16ff51 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -104,9 +104,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        ignore_toggle = false;
 
-       mute_button->set_active (false);
-       solo_button->set_active (false);
-       
        mute_button->set_name ("TrackMuteButton");
        solo_button->set_name ("SoloButton");
        edit_group_button.set_name ("TrackGroupButton");
@@ -118,21 +115,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        hide_button.add (*(manage (new Image (get_xpm("small_x.xpm")))));
 
-       /* XXX is this incomplete? i don't think its very useful atm
-
-       solo_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       mute_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       playlist_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       automation_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       size_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       visual_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       hide_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       */
-
-       solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
-       solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
-       mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
-       mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
        edit_group_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::edit_click), false);
        playlist_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::playlist_click));
        automation_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::automation_click));
@@ -140,10 +122,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        visual_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::visual_click));
        hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click));
 
+       solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
+       solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
+       mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
+       mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
+
        if (is_track()) {
-               rec_enable_button->set_active (false);
                rec_enable_button->set_name ("TrackRecordEnableButton");
-               //rec_enable_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
                rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
                controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
                ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
@@ -188,17 +173,12 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        /* map current state of the route */
 
        update_diskstream_display ();
-       solo_changed(0);
-       mute_changed(0);
-       //redirects_changed (0);
-       //reset_redirect_automation_curves ();
+       redirects_changed (0);
+       reset_redirect_automation_curves ();
        y_position = -1;
 
-       _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
-       _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
        _route->redirects_changed.connect (mem_fun(*this, &RouteTimeAxisView::redirects_changed));
        _route->name_changed.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
-       _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
 
        if (is_track()) {
 
@@ -218,6 +198,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
        ColorChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+
 }
 
 RouteTimeAxisView::~RouteTimeAxisView ()
@@ -253,9 +234,6 @@ RouteTimeAxisView::set_playlist (Playlist *newplaylist)
        assert(pl);
 
        modified_connection.disconnect ();
-       state_changed_connection.disconnect ();
-       
-       state_changed_connection = pl->StateChanged.connect (mem_fun(*this, &RouteTimeAxisView::playlist_state_changed));
        modified_connection = pl->Modified.connect (mem_fun(*this, &RouteTimeAxisView::playlist_modified));
 }
 
@@ -478,7 +456,7 @@ RouteTimeAxisView::build_display_menu ()
 
 
 void
-RouteTimeAxisView::show_timestretch (jack_nframes_t start, jack_nframes_t end)
+RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
 {
        double x1;
        double x2;
@@ -608,19 +586,19 @@ RouteTimeAxisView::set_height (TrackHeight h)
                show_name_entry ();
                hide_name_label ();
 
-               mute_button->show_all();
-               solo_button->show_all();
+               mute_button->show();
+               solo_button->show();
                if (rec_enable_button)
-                       rec_enable_button->show_all();
+                       rec_enable_button->show();
 
-               edit_group_button.show_all();
-               hide_button.show_all();
-               visual_button.show_all();
-               size_button.show_all();
-               automation_button.show_all();
+               edit_group_button.show();
+               hide_button.show();
+               visual_button.show();
+               size_button.show();
+               automation_button.show();
                
                if (is_track() && track()->mode() == ARDOUR::Normal) {
-                       playlist_button.show_all();
+                       playlist_button.show();
                }
                break;
 
@@ -628,10 +606,10 @@ RouteTimeAxisView::set_height (TrackHeight h)
                show_name_entry ();
                hide_name_label ();
 
-               mute_button->show_all();
-               solo_button->show_all();
+               mute_button->show();
+               solo_button->show();
                if (rec_enable_button)
-                       rec_enable_button->show_all();
+                       rec_enable_button->show();
 
                edit_group_button.hide ();
                hide_button.hide ();
@@ -911,7 +889,7 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
 }
 
 void
-RouteTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& results)
+RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
 {
        double speed = 1.0;
        
@@ -919,8 +897,8 @@ RouteTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, do
                speed = get_diskstream()->speed();
        }
        
-       jack_nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
-       jack_nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
+       nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
+       nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
 
        if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) {
                _view->get_selectables (start_adjusted, end_adjusted, results);
@@ -1014,7 +992,7 @@ RouteTimeAxisView::hide_click ()
 }
 
 boost::shared_ptr<Region>
-RouteTimeAxisView::find_next_region (jack_nframes_t pos, RegionPoint point, int32_t dir)
+RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Diskstream> stream;
        Playlist *playlist;
@@ -1079,7 +1057,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 }
 
 bool
-RouteTimeAxisView::paste (jack_nframes_t pos, float times, Selection& selection, size_t nth)
+RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
 {
        if (!is_track()) {
                return false;
@@ -1196,13 +1174,6 @@ RouteTimeAxisView::color_handler (ColorID id, uint32_t val)
        }
 }
 
-bool
-RouteTimeAxisView::select_me (GdkEventButton* ev)
-{
-       editor.get_selection().add (this);
-       return false;
-}
-
 void
 RouteTimeAxisView::show_all_automation ()
 {
Unnamed repository; edit this file 'description' to name the repository.