diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-03-31 17:28:14 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:52 -0400 |
| commit | a4a87f56e9dc8e2351101439aeea7a87064fa146 (patch) | |
| tree | 940715c29eb1fcdd478b1998a9e0caad5032c9df /gtk2_ardour | |
| parent | 94604c6979be790a072c9d76566250a3aadf6e79 (diff) | |
mega-commit to save state of first "it compilesand links" state for separated disk i/o changes.
THIS WILL NOT RUN. THIS REQUIRES MANY CHANGES
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/playlist_selector.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/streamview.cc | 1 |
4 files changed, 3 insertions, 8 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index a58aa81211..ea3aa72060 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -692,10 +692,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) _route->panner_shell()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context()); } - if (is_audio_track()) { - audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context()); - } - _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context()); set_stuff_from_route (); diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index cc92d5d2be..fa9d5531a6 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -272,7 +272,7 @@ PlaylistSelector::selection_changed () return; } - at->use_playlist (apl); + at->use_playlist (DataType::AUDIO, apl); hide (); } diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index e1a7fb9f03..47f74489e1 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1643,7 +1643,7 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist> return; } - track()->use_playlist (pl); + track()->use_playlist (track()->data_type(), pl); RouteGroup* rg = route_group(); @@ -1683,7 +1683,7 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist> track->use_new_playlist(); track->playlist()->set_name(playlist_name); } else { - track->use_playlist(ipl); + track->use_playlist(track->data_type(), ipl); } } } diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index bcab05b9c8..f13826e47b 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -77,7 +77,6 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Container* canvas_g canvas_rect->Event.connect (sigc::bind (sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview)); if (_trackview.is_track()) { - _trackview.track()->DiskstreamChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::diskstream_changed, this), gui_context()); _trackview.track()->rec_enable_control()->Changed.connect (*this, invalidator (*this), boost::bind (&StreamView::rec_enable_changed, this), gui_context()); _trackview.session()->TransportStateChange.connect (*this, invalidator (*this), boost::bind (&StreamView::transport_changed, this), gui_context()); |