← Back to branch summary

~audience-members/audience/cleanup-prsyahmi-merge

« back to all changes in this revision

Viewing changes to src/Audience.vala

  • Committer: Syahmi Azhar
  • Date: 2015-01-10 10:22:11 UTC
  • Revision ID: syahmi@icreative.com.my-20150110102211-b28kv08637xne1zm
Fixed loading/dropping non media file cause welcome screen become hidden

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Audience.vala
223
223
                bottom_bar.set_progression_time (current_time, total_time);
224
224
            });
225
225
 
 
226
            video_player.media_loading.connect (() => {
 
227
                clutter.show ();
 
228
                welcome.hide ();
 
229
            });
 
230
 
226
231
            //end
227
232
            video_player.ended.connect (() => {
228
233
                Idle.add (() => {
407
412
                        run_open_file ();
408
413
                        break;
409
414
                    case 1:
410
 
                        welcome.hide ();
411
 
                        clutter.show_all ();
412
415
                        restore_playlist ();
413
416
                        open_file (filename);
414
417
                        video_player.playing = false;
417
420
                        break;
418
421
                    case 2:
419
422
                    case 3:
420
 
                        welcome.hide ();
421
 
                        clutter.show_all ();
422
423
                        open_file (playlist.get_first_item ().get_path ());
423
424
                        video_player.playing = false;
424
425
                        Idle.add (() => {video_player.progress = 0; return false;});
447
448
                        if (d.run () == Gtk.ResponseType.OK) {
448
449
                            open_file (entry.text, true);
449
450
                            video_player.playing = !settings.playback_wait;
450
 
                            welcome.hide ();
451
 
                            clutter.show_all ();
452
451
                        }
453
452
 
454
453
                        d.destroy ();
577
576
                foreach (var uri in sel.get_uris ()) {
578
577
                    open_file (uri);
579
578
                }
580
 
 
581
 
                welcome.hide ();
582
 
                clutter.show_all ();
583
579
            });
584
580
        }
585
581
 
675
671
                if (video_player.uri == null || welcome.is_visible ())
676
672
                    open_file (file.get_uri ());
677
673
 
678
 
                welcome.hide ();
679
 
                clutter.show_all ();
680
 
 
681
674
                settings.last_folder = file.get_current_folder ();
682
675
            }
683
676
 
704
697
            var root = volume.get_mount ().get_default_location ();
705
698
            open_file (root.get_uri (), true);
706
699
            video_player.playing = !settings.playback_wait;
707
 
 
708
 
            welcome.hide ();
709
 
            clutter.show_all ();
710
700
        }
711
701
 
712
702
        private void toggle_fullscreen () {
806
796
                restore_playlist ();
807
797
 
808
798
                if (settings.last_stopped > 0) {
809
 
                    welcome.hide ();
810
 
                    clutter.show_all ();
811
799
                    open_file (settings.current_video);
812
800
                    video_player.playing = false;
813
801
                    Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
821
809
            if (mainwindow == null)
822
810
                build ();
823
811
 
824
 
            welcome.hide ();
825
 
            clutter.show_all ();
826
812
            foreach (var file in files) {
827
813
                playlist.add_item (file);
828
814
            }