First random playlist

diff --git a/d-fuzz.py b/d-fuzz.py
index 2a981e31a4d3edb2d694582d12c5204381647273..2c0761995fa4ec7ee9912d04d0d723257e383df5 100755 (executable)
--- a/d-fuzz.py
+++ b/d-fuzz.py
@@ -45,6 +45,7 @@ class DFuzz:
         self.conf = []
         self.id = 999999
         self.buffer_size = 0xFFFF
+       self.rand = []
         
     def prog_info(self):
         return """
@@ -97,12 +98,12 @@ class DFuzz:
     def get_random_media(self, playlist):
         lp = len(playlist)
         if self.id > lp:
+            self.rand = randrange(0,lp)
             self.id = 0
         else:
-            rand = randrange(0,lp)
             self.id = self.id + 1
-        print self.id
-        return playlist[self.id]
+        #print self.id
+        return playlist, playlist[self.rand[self.id]]
 
     def core_process(self, command, buffer_size):
         """Apply command and stream data through a generator. 
@@ -150,6 +151,7 @@ class DFuzz:
         # Media
         self.media_dir = station['media']['dir']
         format = station['media']['format']
+       mode_random = station['media']['random']
         s.format = format
 
         # Server
@@ -181,7 +183,10 @@ class DFuzz:
         while True:
             if lp == 0:
                 break 
-            playlist, media = self.get_next_media(playlist)
+            if mode_random == 1:
+               playlist, media = self.get_random_media(playlist)
+            else:
+                playlist, media = self.get_next_media(playlist)
             print 'opening file : %s' % media
             file_name = string.replace(media, self.media_dir + os.sep, '')
             print 'streaming file : %s' % file_name

diff --git a/myfuzz.xml b/myfuzz.xml
index 7d95c3e2ea05be7d31b7081f19a73c867bed58e7..2865bec3edc1c7b1fa723f28c79a0347d65cfb22 100644 (file)
--- a/myfuzz.xml
+++ b/myfuzz.xml
@@ -15,12 +15,13 @@
         <public>1</public>
     </server>
     <media>
-        <dir>/home/momo/music/music3/mp3/Roger Troutman</dir>
+        <dir>/mnt/data/Music/oasis</dir>
         <format>mp3</format>
         <bitrate>192</bitrate>
         <ogg_quality>7</ogg_quality>
         <samplerate>44100</samplerate>
         <voices>2</voices>
+       <random>1</random>
     </media>
 </station>
 

diff --git a/shout-python/build/lib.linux-i686-2.4/shout.so b/shout-python/build/lib.linux-i686-2.4/shout.so
index e5c6ec0af7a2a9f8adb651f085756fa812bd33e0..70ef01cee0d535bfe32821442d04179c7146fceb 100755 (executable)
Binary files a/shout-python/build/lib.linux-i686-2.4/shout.so and b/shout-python/build/lib.linux-i686-2.4/shout.so differ