Changeset 77f938108c38f31000cf130d4f5bef8e31adfb8a

Timestamp:

12/14/09 01:41:22 (3 years ago)

Author:

Guillaume Pellerin <yomguy@…>

Children:

dbe9f5c4d1ea2d8af563d63bd8fb2fd9dd70862e

Parents:

5277dfef6c190c796dab80dc046e6b48c00288ec

git-committer:

Guillaume Pellerin <yomguy@parisson.com> / 2009-12-14T00:41:22Z+0000

Message:

add osc controller and next_media callback to skip current media

Files:

• deefuzzer.py (modified) (12 diffs)
• example/myfuzz.xml (modified) (2 diffs)
• tools/osc_next.py (added)

deefuzzer.py

@@ -47 +47 @@
 import subprocess
 import platform
-import twitter
-import tinyurl
 from threading import Thread
 from tools import *
@@ -137 +135 @@
         self.stations = []
         self.logger.write('Number of stations : ' + str(self.nb_stations))
-
-        # Create M3U playlist
-        self.logger.write('Writing M3U file to : ' + self.m3u)
 
     def get_conf_dict(self):
@@ -161 +156 @@
             i += 1
         m3u.close()
+        self.logger.write('Writing M3U file to : ' + self.m3u)
+
 
     def run(self):
         # Create a Queue
-        # Not too much, otherwise, you will get memory leaks !
         q = Queue.Queue(1)
 
@@ -274 +270 @@
                 self.twitter = Twitter(self.twitter_user, self.twitter_pass)
                 self.twitter_tags = self.station['twitter']['tags'].split(' ')
+                import tinyurl
                 self.tinyurl = tinyurl.create_one(self.channel.url + '/m3u/' + self.m3u.split(os.sep)[-1])
 
@@ -286 +283 @@
                 self.jingle_id = 0
 
+        self.osc_control = '0'
+        if 'control' in self.station:
+            self.osc_control_mode = self.station['control']['mode']
+            self.osc_port = self.station['control']['port']
+            if self.osc_control_mode =='1':
+                self.osc_controller = OSCController(self.osc_port)
+                self.osc_controller.add_method('/media/next', 'i', self.media_next_callback)
+                self.osc_controller.start()
+
+    def media_next_callback(self, path, value):
+        value = value[0]
+        self.osc_next_media = value
+        message = "Received OSC message '%s' with arguments '%d'" % (path, value)
+        self.logger.write(message)
+
     def get_playlist(self):
         file_list = []
@@ -292 +304 @@
                 s = file.split('.')
                 ext = s[len(s)-1]
-                if ext.lower() == self.channel.format and not '/.' in file:
+                if ext.lower() == self.channel.format and not os.sep+'.' in file:
                     file_list.append(root + os.sep + file)
         file_list.sort()
@@ -303 +315 @@
                 s = file.split('.')
                 ext = s[len(s)-1]
-                if ext.lower() == self.channel.format and not '/.' in file:
+                if ext.lower() == self.channel.format and not os.sep+'.' in file:
                     file_list.append(root + os.sep + file)
         file_list.sort()
@@ -458 +470 @@
                 break
             media = self.get_next_media()
+            self.osc_next_media = 0
             self.counter += 1
             q.task_done()
@@ -493 +506 @@
                         self.channel.send(__chunk)
                         self.channel.sync()
+                        if self.osc_next_media != 0:
+                            break
                         # self.logger.write('Station delay (ms) ' + self.short_name + ' : '  + str(self.channel.delay()))
                     except:
@@ -554 +569 @@
 
     def read_slow(self):
-        """Read a bigger part of the media and stream the little parts of data through a generator
+        """Read a bigger part of the media and stream the little parts of the data through a generator
         """
 
@@ -579 +594 @@
 
 class Twitter:
-    """Post a message to Twitter"""
-
+    
     def __init__(self, username, password):
-        #Thread.__init__(self)
+        import twitter
         self.username = username
         self.password = password
@@ -592 +606 @@
         except:
             pass
+
+
+class OSCController(Thread):
+
+    def __init__(self, port):
+        Thread.__init__(self)
+        import liblo
+        self.port = port
+        try:
+            self.server = liblo.Server(self.port)
+        except liblo.ServerError, err:
+            self.logger.write(str(err))
+
+    def add_method(self, path, type, method):
+        self.server.add_method(path, type, method)
+
+    def server(self):
+        return self.server
+
+    def run(self):
+        while True:
+            self.server.recv(1000)
 
 

example/myfuzz.xml

@@ -1 +1 @@
 <deefuzzer>
     <log>/tmp/deefuzz.log</log>
-    <m3u>/var/www/m3u/yomguy_playlist.m3u</m3u>
+    <m3u>/var/www/m3u/mystation.m3u</m3u>
     <station>
         <infos>
@@ -40 +40 @@
             <shuffle>1</shuffle>
         </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1234</port>
+        </control>
     </station>
 </deefuzzer>