Mercurial > hg > svcore

diff base/PlayParameterRepository.h @ 911:73c2fd9a7dbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch tony_integration
author Chris Cannam
date Wed, 14 May 2014 09:54:20 +0100
parents 3a3541b357fe
children c01cbe41aeb5
line wrap: on
line diff
--- a/base/PlayParameterRepository.h	Wed May 07 15:17:58 2014 +0100
+++ b/base/PlayParameterRepository.h	Wed May 14 09:54:20 2014 +0100
@@ -51,8 +51,7 @@
         void setPlayAudible(bool);
         void setPlayPan(float);
         void setPlayGain(float);
-        void setPlayPluginId(QString);
-        void setPlayPluginConfiguration(QString);
+        void setPlayClipId(QString);
         void execute();
         void unexecute();
         QString getName() const;
@@ -65,13 +64,11 @@
 
 signals:
     void playParametersChanged(PlayParameters *);
-    void playPluginIdChanged(const Playable *, QString);
-    void playPluginConfigurationChanged(const Playable *, QString);
+    void playClipIdChanged(const Playable *, QString);
 
 protected slots:
     void playParametersChanged();
-    void playPluginIdChanged(QString);
-    void playPluginConfigurationChanged(QString);
+    void playClipIdChanged(QString);
 
 protected:
     typedef std::map<const Playable *, PlayParameters *> PlayableParameterMap;