Changeset b8048e2f8973fcb1cac10a71e11765d586267e7a

Timestamp:

06/04/10 15:22:39 (3 years ago)

Author:

Guillaume Pellerin <yomguy@…>

Children:

ac00b1520a6c25470705023a35ea81e8aeb5f05a

Parents:

05cce4d1cd60d3fe49925a596ee41aff3d505cf2

git-committer:

Guillaume Pellerin <yomguy@parisson.com> / 2010-06-04T13:22:39Z+0000

Message:

add run mode, fix bad tests

Location:

tools

Files:

• recorder.py (modified) (1 diff)
• station.py (modified) (7 diffs)

tools/recorder.py

@@ -51 +51 @@
     def write(self, chunk):
         self.media.write(chunk)
+        self.media.flush()
 
     def close(self):

tools/station.py

@@ -157 +157 @@
                 self.record_callback('/write', [1])
 
+        # Running
+        # mode = 0 means Off, mode = 1 means On
+        self.run_mode = 1
+
         # OSCing
         self.osc_control_mode = 0
@@ -173 +177 @@
                 self.osc_controller.add_method('/record', 'i', self.record_callback)
                 self.osc_controller.add_method('/player', 'i', self.player_callback)
-
+                self.osc_controller.add_method('/run', 'i', self.run_callback)
+
+    def run_callback(self, path, value):
+        value = value[0]
+        self.run_mode = value
+        message = "Received OSC message '%s' with arguments '%d'" % (path, value)
+        self.logger.write_info(message)
 
     def media_next_callback(self, path, value):
@@ -434 +444 @@
 
     def run(self):
-        while True:
+        while self.run_mode:
             self.q.get(1)
             self.next_media = 0
@@ -440 +450 @@
             self.counter += 1
 
-            if self.relay_mode == 1:
+            if self.relay_mode:
                 self.set_relay_mode()
             elif os.path.exists(self.media) and not os.sep+'.' in self.media:
@@ -450 +460 @@
 
             self.q.get(1)
-            if (not (self.jingles_mode == 1 and (self.counter % 2) == 1) or self.relay_mode == 1) and self.twitter_mode == 1:
+            if (not (self.jingles_mode and (self.counter % 2)) or self.relay_mode) and self.twitter_mode:
                 artist_names = self.artist.split(' ')
                 artist_tags = ' #'.join(list(set(artist_names)-set(['&', '-'])))
@@ -462 +472 @@
             for self.chunk in self.stream:
                 self.q.get(1)
+                if self.next_media or not self.run_mode:
+                    break
                 try:
                     self.channel.send(self.chunk)
                     self.channel.sync()
-                    if self.next_media == 1:
-                        break
                 except:
                     self.channel.close()
@@ -477 +487 @@
                     continue
                 try:
-                    if self.record_mode == 1:
+                    if self.record_mode:
                         self.recorder.write(self.chunk)
                 except: