Merge remote-tracking branch 'upstream/1.12'

Conflicts:
	plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
	plugins/soundsourcem4a/soundsourcem4a.cpp
	plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
	plugins/soundsourcemediafoundation/soundsourcemediafoundation.h
	plugins/soundsourcewv/soundsourcewv.cpp
	src/audiotagger.cpp
	src/dlgabout.cpp
	src/library/cratefeature.cpp
	src/library/dao/trackdao.cpp
	src/library/dao/trackdao.h
	src/library/scanner/libraryscanner.cpp
	src/soundsource.h
	src/soundsourcecoreaudio.cpp
	src/soundsourceffmpeg.cpp
	src/soundsourceflac.cpp
	src/soundsourcemp3.cpp
	src/soundsourceoggvorbis.cpp
	src/soundsourceopus.cpp
	src/soundsourcesndfile.cpp

1 files changed, 2 insertions, 0 deletions

diff --git a/src/library/baseplaylistfeature.h b/src/library/baseplaylistfeature.h
index 06dacd46a7..02bd4beea9 100644
--- a/src/library/baseplaylistfeature.h
+++ b/src/library/baseplaylistfeature.h
@@ -47,6 +47,7 @@ class BasePlaylistFeature : public LibraryFeature {
     virtual void htmlLinkClicked(const QUrl& link);
 
     virtual void slotPlaylistTableChanged(int playlistId) = 0;
+    virtual void slotPlaylistContentChanged(int playlistId) = 0;
     virtual void slotPlaylistTableRenamed(int playlistId, QString a_strName) = 0;
     void slotCreatePlaylist();
 
@@ -63,6 +64,7 @@ class BasePlaylistFeature : public LibraryFeature {
 
   protected:
     virtual QModelIndex constructChildModel(int selected_id);
+    virtual void updateChildModel(int selected_id);
     virtual void clearChildModel();
     virtual void buildPlaylistList() = 0;
     virtual void decorateChild(TreeItem *pChild, int playlist_id) = 0;