Play multiple files

KeyConfig.cpp

@@ -128,6 +128,8 @@ map<int, int> KeyConfig::buildDefaultKeymap()
     keymap['v'] = ACTION_STEP;
     keymap['w'] = ACTION_SHOW_SUBTITLES;
     keymap['x'] = ACTION_HIDE_SUBTITLES;
+    keymap['b'] = ACTION_PREVIOUS_FILE;
+    keymap['a'] = ACTION_NEXT_FILE;
 
     return keymap;
 }

KeyConfig.h

@@ -45,6 +45,8 @@ class KeyConfig
         ACTION_PLAY = 36,
         ACTION_CHANGE_FILE = 37,
         ACTION_SET_LAYER = 38,
+        ACTION_PREVIOUS_FILE = 39,
+        ACTION_NEXT_FILE = 40
     };
 
     #define KEY_LEFT 0x5b44

OMXControl.cpp

@@ -788,6 +788,16 @@ OMXControlResult OMXControl::handle_event(DBusMessage *m)
     dbus_respond_ok(m);
     return KeyConfig::ACTION_PREVIOUS_CHAPTER;
   }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "NextFile"))
+  {
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_NEXT_FILE;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "PreviousFile"))
+  {
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_PREVIOUS_FILE;
+  }
   else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Pause"))
   {
     dbus_respond_ok(m);

README.md

@@ -70,7 +70,7 @@ Copy over `omxplayer-dist/*` to the Pi `/`.
 
 ## SYNOPSIS
 
-Usage: omxplayer [OPTIONS] [FILE]
+Usage: omxplayer [OPTIONS] [FILE] ...
 
     -h  --help                  Print this help
     -v  --version               Print version info
@@ -136,7 +136,7 @@ Usage: omxplayer [OPTIONS] [FILE]
 
 For example:
 
-    ./omxplayer -p -o hdmi test.mkv
+    ./omxplayer -p -o hdmi test.mkv test2.mpeg
 
 ## KEY BINDINGS
 
@@ -151,6 +151,8 @@ Key bindings to control omxplayer while playing:
     k           next audio stream
     i           previous chapter
     o           next chapter
+    b           previous file
+    a           next file
     n           previous subtitle stream
     m           next subtitle stream
     s           toggle subtitles
@@ -182,6 +184,8 @@ The list of valid [action]s roughly corresponds to the list of default key bindi
     NEXT_AUDIO
     PREVIOUS_CHAPTER
     NEXT_CHAPTER
+    PREVIOUS_FILE
+    NEXT_FILE
     PREVIOUS_SUBTITLE
     NEXT_SUBTITLE
     TOGGLE_SUBTITLE
@@ -363,6 +367,22 @@ paused it will stay in pause (no effect).
 :-------------: | -------
  Return         | `null`
 
+#### NextFile
+
+Skip to the next file.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
+#### PreviousFile
+
+Skip to the previous file.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
 ##### PlayPause
 
 Toggles the play state.  If the video is playing, it will be paused, if it is

omxplayer.cpp

@@ -525,6 +525,7 @@ int main(int argc, char *argv[])
   TV_DISPLAY_STATE_T   tv_state;
   double last_seek_pos = 0;
   bool idle = false;
+  bool m_continue = true;
   std::string            m_cookie              = "";
   std::string            m_user_agent          = "";
   std::string            m_lavfdopts           = "";
@@ -934,6 +935,9 @@ int main(int argc, char *argv[])
     return 0;
   }
 
+  int firstFileIndex = optind;
+  while(optind < argc) {
+	m_continue = false;
   m_filename = argv[optind];
 
   auto PrintFileNotFound = [](const std::string& path)
@@ -1422,6 +1426,16 @@ int main(int argc, char *argv[])
         m_stop = true;
         goto do_exit;
         break;
+      case KeyConfig::ACTION_NEXT_FILE:
+        goto do_continue;
+        break;
+      case KeyConfig::ACTION_PREVIOUS_FILE:
+    	  if(optind > firstFileIndex){
+    		  // will be increased by one at the end of the loop
+    		  optind-=2;
+    	  }
+        goto do_continue;
+        break;
       case KeyConfig::ACTION_SEEK_BACK_SMALL:
         if(m_omx_reader.CanSeek()) m_incr = -30.0;
         break;
@@ -1578,7 +1592,7 @@ int main(int argc, char *argv[])
       sentStarted = false;
 
       if (m_omx_reader.IsEof())
-        goto do_exit;
+        goto do_continue;
 
       // Quick reset to reduce delay during loop & seek.
       if (m_has_video && !m_player_video.Reset())
@@ -1828,6 +1842,8 @@ int main(int argc, char *argv[])
     }
   }
 
+do_continue:
+	m_continue = true;
 do_exit:
   if (m_stats)
     printf("\n");
@@ -1876,6 +1892,11 @@ int main(int argc, char *argv[])
   g_OMX.Deinitialize();
   g_RBP.Deinitialize();
 
+  	  if(!m_continue){
+  		  break;
+  	  }
+  	  optind++;
+  }
   printf("have a nice day ;)\n");
 
   // exit status success on playback end