From 73fbfcab7ebbdaf94d63a024058c0db578ea14ea Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harryhaaren@gmail.com>
Date: Thu, 22 Aug 2013 02:45:03 +0100
Subject: [PATCH] -ClipSelector sets --- as name for recorded clips

---
 src/avtk/avtk_clip_selector.h | 59 ++++++++++-------------------------
 1 file changed, 17 insertions(+), 42 deletions(-)

diff --git a/src/avtk/avtk_clip_selector.h b/src/avtk/avtk_clip_selector.h
index 4ad4c11..a2fe816 100644
--- a/src/avtk/avtk_clip_selector.h
+++ b/src/avtk/avtk_clip_selector.h
@@ -54,15 +54,20 @@ class ClipState
       name = n;
     }
     
-    GridLogic::State getState()
-    {
-      return state;
-    }
     void setState(GridLogic::State s)
     {
       state = s;
     }
-    std::string getName(){return name;}
+    
+    std::string getName()
+    {
+      return name;
+    }
+    
+    GridLogic::State getState()
+    {
+      return state;
+    }
   
   private:
     GridLogic::State state;
@@ -109,50 +114,20 @@ class ClipSelector : public Fl_Button
     **/
     void setState( int clipNum, GridLogic::State s )
     {
-      /*
       switch(s)
       {
-        case GridLogic::STATE_EMPTY:
-            break;
-        case GridLogic::STATE_STOPPED:
-            clips[clipNum].load();
-            clips[clipNum].unqueue();
-            //printf("clipSelector setState() clip %i = STATE_STOPPED\n", clipNum);
-            break;
-        case GridLogic::STATE_PLAYING:
-            //printf("clipSelector setState() clip %i = STATE_PLAYING\n", clipNum);
-            for(int i = 0; i < numClips; i++ )
-              clips[clipNum].stop();
-            clips[clipNum].unqueue();
-            clips[clipNum].play();
-            break;
-        case GridLogic::STATE_PLAY_QUEUED:
-            for(int i = 0; i < numClips; i++ )
-              clips[clipNum].unqueue();
-            clips[clipNum].queue();
-            //printf("clipSelector setState() clip %i = STATE_PLAY_QUEUED\n", clipNum);
-            break;
         case GridLogic::STATE_RECORDING:
-            for(int i = 0; i < numClips; i++ )
-              clips[clipNum].stopRecord();
-            clips[clipNum].unqueue();
-            clips[clipNum].record();
-            //printf("clipSelector setState() clip %i = STATE_RECORDING\n", clipNum);
+            clips[clipNum].setName();
             break;
+        case GridLogic::STATE_EMPTY:
+        case GridLogic::STATE_STOPPED:
+        case GridLogic::STATE_PLAYING:
+        case GridLogic::STATE_PLAY_QUEUED:
         case GridLogic::STATE_RECORD_QUEUED:
-            for(int i = 0; i < numClips; i++ )
-              clips[clipNum].unqueue();
-            clips[clipNum].queue();
-            //printf("clipSelector setState() clip %i = STATE_RECORD_QUEUED\n", clipNum);
-            break;
         case GridLogic::STATE_STOP_QUEUED:
-            //printf("clipSelector setState() clip %i = STATE_STOP_QUEUED\n", clipNum);
-            clips[clipNum].stopRecord();
-            clips[clipNum].stop();
-            clips[clipNum].queue();
-            break;
+        default: break;
       }
-      */
+      
       clips[clipNum].setState( s );
       
       redraw();