← Back to branch summary

~timo-jyrinki/ubuntu/utopic/rhythmbox/enable_grilo_rhythmbox

« back to all changes in this revision

Viewing changes to shell/rb-shell-player.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-03-12 12:07:21 UTC
  • mfrom: (1.2.28)
  • Revision ID: package-import@ubuntu.com-20120312120721-ubdep6yl0sgfbr7i
Tags: 2.96-1
* New upstream release.
* Update Build-Depends:
  - Bump libgtk-3-dev to (>= 3.2.0).
  - Drop gir1.2-gtk-3.0, pulled via libgtk-3-dev.
  - Bump libglib2.0-dev (>= 2.28.0).
* Re-add magnatune plugin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/rb-shell-player.c
799
799
                return;
800
800
        }
801
801
 
 
802
        if (player->priv->playing_entry_eos) {
 
803
                rb_debug ("playing entry has already EOS'd");
 
804
                return;
 
805
        }
 
806
 
802
807
        if (entry != NULL) {
803
808
                if (player->priv->playing_entry != entry) {
804
809
                        rb_debug ("EOS'd entry is not the current playing entry; ignoring");
805
810
                        return;
806
811
                }
807
 
        }
808
812
 
809
 
        if (player->priv->playing_entry_eos) {
810
 
                rb_debug ("playing entry has already EOS'd");
811
 
                return;
 
813
                rhythmdb_entry_ref (entry);
812
814
        }
813
815
 
814
816
        /* defer EOS handling while the position slider is being dragged */
816
818
        if (dragging) {
817
819
                rb_debug ("slider is dragging, will handle EOS (if applicable) on release");
818
820
                player->priv->playing_entry_eos = TRUE;
 
821
                if (entry != NULL)
 
822
                        rhythmdb_entry_unref (entry);
819
823
                return;
820
824
        }
821
825
 
897
901
                                                  player->priv->db,
898
902
                                                  entry);
899
903
        }
 
904
 
 
905
        if (entry != NULL)
 
906
                rhythmdb_entry_unref (entry);
900
907
}
901
908
 
902
909
static void