Fix changing playlist (Track is responsible for signal emission)

diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h
index c839191331a50aa16f783352f8950560891f0159..63378c4cac7a463bbbbd5210827431ec2a367914 100644 (file)
--- a/libs/ardour/ardour/disk_io.h
+++ b/libs/ardour/ardour/disk_io.h
@@ -110,8 +110,6 @@ class LIBARDOUR_API DiskIOProcessor : public Processor
        virtual void playlist_modified () {}
        virtual int use_playlist (DataType, boost::shared_ptr<Playlist>);
 
-       PBD::Signal1<void,DataType>   PlaylistChanged;
-
        virtual void adjust_buffering() = 0;
 
   protected:

diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc
index 83f082a4f4b85108a01849f87bd8f5b7a0406afa..a2bc61115826aaee89aeb65209e9479fd08f877f 100644 (file)
--- a/libs/ardour/disk_io.cc
+++ b/libs/ardour/disk_io.cc
@@ -362,9 +362,6 @@ DiskIOProcessor::use_playlist (DataType dt, boost::shared_ptr<Playlist> playlist
 
        DEBUG_TRACE (DEBUG::DiskIO, string_compose ("%1 now using playlist %1 (%2)\n", name(), playlist->name(), playlist->id()));
 
-       PlaylistChanged (dt); /* EMIT SIGNAL */
-       _session.set_dirty ();
-
        return 0;
 }
 

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index a86584ec651413298e89ed94bc5ae4cfd46b5179..38d13d186da4eaaf53bff03b27c10e1edeb4036c 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -827,6 +827,9 @@ Track::use_playlist (DataType dt, boost::shared_ptr<Playlist> p)
                _playlists[dt] = p;
        }
 
+       _session.set_dirty ();
+       PlaylistChanged (); /* EMIT SIGNAL */
+
        return ret;
 }