Mercurial > hg > svcore

diff base/Playable.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 ad14e7ed096d
line wrap: on
line diff
--- a/base/Playable.h	Wed May 07 15:17:58 2014 +0100
+++ b/base/Playable.h	Wed May 14 09:54:20 2014 +0100
@@ -24,8 +24,7 @@
     virtual ~Playable() { }
     
     virtual bool canPlay() const { return false; }
-    virtual QString getDefaultPlayPluginId() const { return ""; }
-    virtual QString getDefaultPlayPluginConfiguration() const { return ""; }
+    virtual QString getDefaultPlayClipId() const { return ""; }
 };
 
 #endif