Merge lp:~voldyman/audience/fixed-999073-998706 into lp:~audience-members/audience/trunk

[Akshay Shekher]

fixed playlist bugs by adding play function

[Tom Beckmann (tombeckmann)]

review: Approve

=== modified file 'Audience/Audience.vala'
--- Audience/Audience.vala	2012-07-15 18:27:18 +0000
+++ Audience/Audience.vala	2012-07-15 18:27:18 +0000
@@ -168,7 +168,8 @@
             });
             //playlist wants us to open a file
             playlist.play.connect ( (file) => {
-                this.open_file (file.get_path ());
+                this.current_file = file;
+                this.play_file ();
             });
             
             //handle welcome
@@ -751,20 +752,20 @@
 
             if (this.current_file.query_file_type (0) == FileType.DIRECTORY) {
                 Audience.recurse_over_dir (this.current_file, (file_ret) => {
-                        this.playlist.add_item (file_ret);
-                        print (file_ret.get_uri ()+"\n");
+                        this.playlist.add_item (file_ret);                        
                 });
                 this.current_file = this.playlist.get_first_item ();
             }
             else {
                 this.playlist.add_item (this.current_file);
             }
-        
+            play_file ();
+        }
+
+        public void play_file () {
             this.reached_end = false;
             debug ("Opening %s", this.current_file.get_uri ());
-            var uri = this.current_file.get_uri ();
-            if (dont_modify) //fixes dvd support
-                uri = filename;
+            var uri = this.current_file.get_uri ();            
             canvas.uri = uri;
             canvas.audio_volume = 1.0;
             this.controls.slider.preview.uri = uri;