diff base/PlayParameterRepository.cpp @ 866:3a3541b357fe tonioni

sampleId -> clipId

--- a/base/PlayParameterRepository.cpp	Tue Jan 07 15:49:39 2014 +0000
+++ b/base/PlayParameterRepository.cpp	Tue Jan 07 15:52:34 2014 +0000
@@ -47,14 +47,14 @@
         PlayParameters *params = new PlayParameters;
         m_playParameters[playable] = params;
 
-        params->setPlaySampleId
-            (playable->getDefaultPlaySampleId());
+        params->setPlayClipId
+            (playable->getDefaultPlayClipId());
         
         connect(params, SIGNAL(playParametersChanged()),
                 this, SLOT(playParametersChanged()));
         
-        connect(params, SIGNAL(playSampleIdChanged(QString)),
-                this, SLOT(playSampleIdChanged(QString)));
+        connect(params, SIGNAL(playClipIdChanged(QString)),
+                this, SLOT(playClipIdChanged(QString)));
 
         cerr << "Connected play parameters " << params << " for playable "
                      << playable << " to this " << this << endl;
@@ -101,13 +101,13 @@
 }
 
 void
-PlayParameterRepository::playSampleIdChanged(QString id)
+PlayParameterRepository::playClipIdChanged(QString id)
 {
     PlayParameters *params = dynamic_cast<PlayParameters *>(sender());
     for (PlayableParameterMap::iterator i = m_playParameters.begin();
          i != m_playParameters.end(); ++i) {
         if (i->second == params) {
-            emit playSampleIdChanged(i->first, id);
+            emit playClipIdChanged(i->first, id);
             return;
         }
     }
@@ -155,9 +155,9 @@
 }
 
 void
-PlayParameterRepository::EditCommand::setPlaySampleId(QString id)
+PlayParameterRepository::EditCommand::setPlayClipId(QString id)
 {
-    m_to.setPlaySampleId(id);
+    m_to.setPlayClipId(id);
 }
 
 void
@@ -195,7 +195,7 @@
         if (++changed > 1) return multiname;
     }
 
-    if (m_to.getPlaySampleId() != m_from.getPlaySampleId()) {
+    if (m_to.getPlayClipId() != m_from.getPlayClipId()) {
         name = tr("Change Playback Sample");
         if (++changed > 1) return multiname;
     }