Part of Slepp's ProjectsPastebinTURLImagebinFilebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate
Sign In | Create Account

Miscellany
Tuesday, April 15th, 2008 at 12:32:48pm UTC 

  1. Index: apps/playback.c
  2. ===================================================================
  3. --- apps/playback.c     (revision 17112)
  4. +++ apps/playback.c     (working copy)
  5. @@ -244,7 +244,6 @@
  6.  
  7.  /* Track change controls */
  8.  static bool automatic_skip = false; /* Who initiated in-progress skip? (C/A-) */
  9. -static bool playlist_end = false;   /* Has the current playlist ended? (A) */
  10.  static bool dir_skip = false;       /* Is a directory skip pending? (A) */
  11.  static bool new_playlist = false;   /* Are we starting a new playlist? (A) */
  12.  static int wps_offset = 0;          /* Pending track change offset, to keep WPS responsive (A) */
  13. @@ -1614,7 +1613,6 @@
  14.      if (!trackname)
  15.      {
  16.          logf("End-of-playlist");
  17. -        playlist_end = true;
  18.          memset(&lasttrack_id3, 0, sizeof(struct mp3entry));
  19.          filling = STATE_FINISHED;
  20.          return false;
  21. @@ -1979,7 +1977,6 @@
  22.  
  23.      if (automatic_skip)
  24.      {
  25. -        playlist_end = false;
  26.          wps_offset = -ci.new_track;
  27.          track_changed = true;
  28.      }
  29. @@ -2074,7 +2071,7 @@
  30.      {
  31.          struct mp3entry *id3 = NULL;
  32.  
  33. -        if (!playlist_end || !ci.stop_codec)
  34. +        if (!ci.stop_codec)
  35.          {
  36.              /* Set this early, the outside code yields and may allow the codec
  37.                 to try to wait for a reply on a buffer wait */
  38. @@ -2121,7 +2118,6 @@
  39.      audio_stop_codec_flush();
  40.  
  41.      track_changed = true;
  42. -    playlist_end = false;
  43.  
  44.      playing = true;
  45.  
  46. @@ -2161,7 +2157,6 @@
  47.      if (audio_have_tracks())
  48.      {
  49.          last_peek_offset = 0;
  50. -        playlist_end = false;
  51.          track_widx = track_ridx;
  52.  
  53.          /* Mark all other entries null (also buffered wrong metadata). */
  54. @@ -2181,7 +2176,6 @@
  55.      {
  56.          if (paused)
  57.              skipped_during_pause = true;
  58. -        playlist_end = false;
  59.          track_widx = track_ridx;
  60.          audio_clear_track_entries();
  61.  
  62. @@ -2206,7 +2200,6 @@
  63.  {
  64.      logf("audio_initiate_track_change(%ld)", direction);
  65.  
  66. -    playlist_end = false;
  67.      ci.new_track += direction;
  68.      wps_offset -= direction;
  69.      if (paused)
  70. @@ -2216,7 +2209,6 @@
  71.  /* Called on manual dir skip */
  72.  static void audio_initiate_dir_change(long direction)
  73.  {
  74. -    playlist_end = false;
  75.      dir_skip = true;
  76.      ci.new_track = direction;
  77.      if (paused)
  78. @@ -2402,7 +2394,6 @@
  79.  
  80.              case Q_AUDIO_DIR_SKIP:
  81.                  LOGFQUEUE("audio < Q_AUDIO_DIR_SKIP");
  82. -                playlist_end = false;
  83.                  audio_initiate_dir_change(ev.data);
  84.                  break;
  85.  

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will expire by default in one month. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

comments powered by Disqus
worth-right
worth-right
worth-right