Got the good linear loop with adding capable

diff --git a/d-fuzz.py b/d-fuzz.py
index ddaafebf769cbc9fcf24b175414b83e626982270..37530c9ee45de60bded32bfcaaeff597450f76e6 100755 (executable)
--- a/d-fuzz.py
+++ b/d-fuzz.py
@@ -91,11 +91,12 @@ class DFuzz:
     def get_next_media(self, playlist):
         lp = len(playlist)
         if self.id >= (lp - 1) :
+            playlist = self.get_playlist()
             self.id = 0
         else:
             self.id = self.id + 1
         #print self.id
-        return playlist[self.id]
+        return playlist, playlist[self.id]
     
     def get_random_media(self, playlist):
         lp = len(playlist)
@@ -179,17 +180,15 @@ class DFuzz:
         #total = 0
         #st = time.time()
         command = 'cat '
-
+        playlist = self.get_playlist()
+        lp = len(playlist)
+        print 'Playlist :'
+        print playlist
+                    
         while True:
-            playlist = self.get_playlist()
-            print 'Playlist :'
-            print playlist
-            
-            lp = len(playlist)
             if lp == 0:
-                break
-
-            media = self.get_next_media(playlist)
+                break 
+            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 36faf7c485a91434e98fb9b3a699b16fac3b626e..9aeddd879e426baea25c6682bd3012a4ec8b8583 100644 (file)
--- a/myfuzz.xml
+++ b/myfuzz.xml
@@ -15,7 +15,7 @@
         <public>1</public>
     </server>
     <media>
-        <dir>/home/momo/music/mp3/Birdy Nam Nam/tmp</dir>
+        <dir>/home/momo/music/mp3/</dir>
         <format>mp3</format>
         <bitrate>192</bitrate>
         <ogg_quality>7</ogg_quality>