Changeset 60e9f290c2b1898ca1c169f1b7c7dbc7406e83d6

Timestamp:

09/09/07 18:14:40 (6 years ago)

Author:

Guillaume Pellerin <yomguy@…>

Children:

259dfb7e26f50f4a2edeca13b4e11a048db29fc6

Parents:

d433870b2eab045638df68e6a8b46374ca9f9214

git-committer:

Guillaume Pellerin <yomguy@parisson.com> / 2007-09-09T16:14:40Z+0000

Message:

First random playlist

Files:

• d-fuzz.py (modified) (4 diffs)
• myfuzz.xml (modified) (2 diffs)
• shout-python/build/lib.linux-i686-2.4/shout.so (modified) (previous)

d-fuzz.py

@@ -46 +46 @@
         self.id = 999999
         self.buffer_size = 0xFFFF
+        self.rand = []
         
     def prog_info(self):
@@ -98 +99 @@
         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):
@@ -151 +152 @@
         self.media_dir = station['media']['dir']
         format = station['media']['format']
+        mode_random = station['media']['random']
         s.format = format
 
@@ -182 +184 @@
             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, '')

myfuzz.xml

@@ -16 +16 @@
     </server>
     <media>
-        <dir>/home/momo/music/music3/mp3/Roger Troutman</dir>
+        <dir>/mnt/data/Music/oasis</dir>
         <format>mp3</format>
         <bitrate>192</bitrate>
@@ -22 +22 @@
         <samplerate>44100</samplerate>
         <voices>2</voices>
+        <random>1</random>
     </media>
 </station>