looks fine, some things to do

2 files changed, 362 insertions, 33 deletions

diff --git a/Midi_Interface/rhmixxx_midi_controller_MIDI_1-scripts.js b/Midi_Interface/rhmixxx_midi_controller_MIDI_1-scripts.js
index 7822842..d5dcada 100644
--- a/Midi_Interface/rhmixxx_midi_controller_MIDI_1-scripts.js
+++ b/Midi_Interface/rhmixxx_midi_controller_MIDI_1-scripts.js
@@ -50,14 +50,264 @@ RHMixxx.init = function () {
    engine.connectControl("[Sampler10]", "play", "RHMixxx.Sampler10_playing");
    engine.connectControl("[Sampler11]", "play", "RHMixxx.Sampler11_playing");
    engine.connectControl("[Sampler12]", "play", "RHMixxx.Sampler12_playing");
+   
+  //engine.connectControl("[Channel1]", "stop", "RHMixxx.Channel1_playing");
+  //engine.connectControl("[Channel2]", "stop", "RHMixxx.Channel2_playing");
+
+  engine.connectControl("[Channel1]", "play_indicator", "RHMixxx.Channel1_playing");
+  
+  
+  //Init Sampler Repeat mode
 
-   engine.connectControl("[Channel1]", "play_indicator", "RHMixxx.Channel1_playing");
 }
 
 RHMixxx.shutdown = function () {
     RHMixxx.OffAllLED();
 }
 
+
+///////////////////////////
+//                       //
+//        Stop           //
+//   Handling            //
+//                       //
+///////////////////////////
+
+
+RHMixxx.StopPlayer1 = function (channel, control, value, status, group) {
+	    engine.setValue("[Channel1]","cue_default",1);
+ 
+	}
+	
+RHMixxx.StopPlayer2 = function (channel, control, value, status, group) {
+	    engine.setValue("[Channel2]","cue_default",1);
+        //engine.setValue("[Channel2]","cue_default",0);
+        
+	}
+
+
+// Samplers
+
+
+RHMixxx.Sampler1play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler1]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler1]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler1]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler2play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler2]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler2]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler2]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler3play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler3]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler3]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler3]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler4play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler4]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler4]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler4]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler5play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler5]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler5]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler5]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler6play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler6]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler6]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler6]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler7play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler7]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler7]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler7]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler8play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler8]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler8]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler8]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler9play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler9]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler9]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler9]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler10play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler10]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler10]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler10]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler11play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler11]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler11]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler11]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+RHMixxx.Sampler12play = function (channel, control, value, status, group) {
+
+{			
+    var currentlyPlaying = engine.getValue("[Sampler12]","play");
+    if (currentlyPlaying == 0){
+        engine.setValue("[Sampler12]","play",1);
+        //midi.sendShortMsg(0x80,0x01,0x00);
+    }
+    else {
+        if (currentlyPlaying == 1){
+	    engine.setValue("[Sampler12]","cue_default",1);
+            //midi.sendShortMsg(0x90,0x01,0x00);
+        }
+        
+    }
+}
+}
+
+
+
+
 ///////////////////////////
 //                       //
 //        Functions      //
@@ -107,9 +357,16 @@ RHMixxx.Sampler1_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler1]","play");
+    var position = engine.getValue("[Sampler1]","playposition");
     if (currentlyPlaying == 0){
+		midi.sendShortMsg(0x80,0x04,0x00);
         //engine.setValue("[Sampler1]","play",1);
-        midi.sendShortMsg(0x80,0x04,0x00);
+        //engine.setValue([Sampler1], "cue_gotoandstop", 1);
+        if (position == 1){
+			engine.setValue("[Sampler1]","playposition", 0);
+		}
+		
+
     }
     else {
         if (currentlyPlaying == 1){
@@ -126,9 +383,14 @@ RHMixxx.Sampler2_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler2]","play");
+    var position = engine.getValue("[Sampler2]","playposition");
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler2]","play",1);
         midi.sendShortMsg(0x80,0x05,0x00);
+        
+        if (position == 1){
+			engine.setValue("[Sampler2]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -145,9 +407,14 @@ RHMixxx.Sampler3_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler3]","play");
+    var position = engine.getValue("[Sampler3]","playposition");
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler3]","play",1);
         midi.sendShortMsg(0x80,0x06,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler3]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -164,9 +431,15 @@ RHMixxx.Sampler4_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler4]","play");
+    var position = engine.getValue("[Sampler4]","playposition");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler4]","play",1);
         midi.sendShortMsg(0x80,0x07,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler4]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -183,9 +456,15 @@ RHMixxx.Sampler5_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler5]","play");
+    var position = engine.getValue("[Sampler5]","playposition");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler5]","play",1);
         midi.sendShortMsg(0x80,0x08,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler5]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -202,9 +481,15 @@ RHMixxx.Sampler6_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler6]","play");
+    var position = engine.getValue("[Sampler6]","playposition");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler6]","play",1);
         midi.sendShortMsg(0x80,0x09,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler6]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -221,9 +506,15 @@ RHMixxx.Sampler7_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler7]","play");
+    var position = engine.getValue("[Sampler7]","playposition");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler7]","play",1);
         midi.sendShortMsg(0x80,0x0a,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler7]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -240,9 +531,15 @@ RHMixxx.Sampler8_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler8]","play");
+    var position = engine.getValue("[Sampler8]","playposition");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler8]","play",1);
         midi.sendShortMsg(0x80,0x0b,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler8]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -259,9 +556,15 @@ RHMixxx.Sampler9_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler9]","play");
+    var position = engine.getValue("[Sampler9]","playposition");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler9]","play",1);
         midi.sendShortMsg(0x80,0x0c,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler9]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -278,9 +581,15 @@ RHMixxx.Sampler10_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler10]","play");
+    var position = engine.getValue("[Sampler10]","playposition");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler10]","play",1);
         midi.sendShortMsg(0x80,0x0d,0x00);
+         
+        if (position == 1){
+			engine.setValue("[Sampler10]","playposition", 0);
+		}
     }
     else {
         if (currentlyPlaying == 1){
@@ -297,33 +606,47 @@ RHMixxx.Sampler11_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler11]","play");
+    var position = engine.getValue("[Sampler11]","playposition");
+    var duration = engine.getValue("[Sampler11]","duration");
+
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler11]","play",1);
         midi.sendShortMsg(0x80,0x0e,0x00);
+         
+         if(position == 1){
+			 engine.setValue("[Sampler11]","playposition",0);
+		 }
     }
     else {
         if (currentlyPlaying == 1){
             //engine.setValue("[Sampler11]","play",0);
             midi.sendShortMsg(0x90,0x0e,0x00);
         }
-        
     }
 }
 engine.trigger("[Sampler11]","play");
 }
 
+
+
+
 RHMixxx.Sampler12_playing = function (channel, control, value, status, group) {
 
 	{			
     var currentlyPlaying = engine.getValue("[Sampler12]","play");
+    var position = engine.getValue("[Sampler12]","playposition");
     if (currentlyPlaying == 0){
         //engine.setValue("[Sampler12]","play",1);
-        midi.sendShortMsg(0x80,0x10,0x00);
+        midi.sendShortMsg(0x80,0x0f,0x00);
     }
     else {
         if (currentlyPlaying == 1){
             //engine.setValue("[Sampler12]","cue_default",1);
             midi.sendShortMsg(0x90,0x0f,0x00);
+             
+        if (position == 1){
+			engine.setValue("[Sampler12]","playposition", 0);
+		}
         }
         
     }
diff --git a/Midi_Interface/rhmixxx_midi_controller_MIDI_1.midi.xml b/Midi_Interface/rhmixxx_midi_controller_MIDI_1.midi.xml
index 0650451..8fcfe16 100644
--- a/Midi_Interface/rhmixxx_midi_controller_MIDI_1.midi.xml
+++ b/Midi_Interface/rhmixxx_midi_controller_MIDI_1.midi.xml
@@ -9,10 +9,10 @@
                 <status>0x90</status>
                 <midino>0x00</midino>
                 <group>[Channel1]</group>
-                <key>start_stop</key>
+                <key>RHMixxx.StopPlayer1</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
@@ -28,10 +28,10 @@
                 <status>0x90</status>
                 <midino>0x02</midino>
                 <group>[Channel2]</group>
-                <key>end</key>
+                <key>RHMixxx.StopPlayer2</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
@@ -44,124 +44,130 @@
                     <normal/>
                 </options>
             </control>
+            
+            
+            
+            
+            
+            
             <control>
                 <status>0x90</status>
                 <midino>0x4</midino>
                 <group>[Sampler1]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler1play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0x5</midino>
                 <group>[Sampler2]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler2play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0x6</midino>
                 <group>[Sampler3]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler3play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0x7</midino>
                 <group>[Sampler4]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler4play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0x8</midino>
                 <group>[Sampler5]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler5play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0x9</midino>
                 <group>[Sampler6]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler6play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0xa</midino>
                 <group>[Sampler7]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler7play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0xb</midino>
                 <group>[Sampler8]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler8play</key>
                 <description></description>
-                <options>
-                    <normal/>
+                <options>mixxx
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0xc</midino>
                 <group>[Sampler9]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler9play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0xd</midino>
                 <group>[Sampler10]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler10play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0xe</midino>
                 <group>[Sampler11]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler11play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>
             <control>
                 <status>0x90</status>
                 <midino>0xf</midino>
                 <group>[Sampler12]</group>
-                <key>play</key>
+                <key>RHMixxx.Sampler12play</key>
                 <description></description>
                 <options>
-                    <normal/>
+                    <Script-Binding/>
                 </options>
             </control>