[vlc-commits] playlist: remove constant duration parameter to playlist_AddExt()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 19 12:59:11 2016 +0200| [8cc1c986b8288cf9444ee4809cad53f751695218] | committer: Rémi Denis-Courmont

playlist: remove constant duration parameter to playlist_AddExt()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8cc1c986b8288cf9444ee4809cad53f751695218
---

 include/vlc_playlist.h     | 2 +-
 modules/control/win_msg.c  | 2 +-
 modules/gui/qt/recents.cpp | 1 -
 src/interface/interface.c  | 2 +-
 src/os2/specific.c         | 2 +-
 src/playlist/item.c        | 7 ++-----
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index dbcdb51..2ea0811 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -322,7 +322,7 @@ VLC_API int playlist_ServicesDiscoveryControl( playlist_t *, const char *, int,
 
 /******************** Item addition ********************/
 VLC_API int playlist_Add( playlist_t *, const char *, const char *, int, int, bool );
-VLC_API int playlist_AddExt( playlist_t *, const char *, const char *, int, int, mtime_t, int, const char *const *, unsigned, bool );
+VLC_API int playlist_AddExt( playlist_t *, const char *, const char *, int, int, int, const char *const *, unsigned, bool );
 VLC_API int playlist_AddInput( playlist_t *, input_item_t *, int, int, bool );
 VLC_API playlist_item_t * playlist_NodeAddInput( playlist_t *, input_item_t *, playlist_item_t *, int, int );
 VLC_API int playlist_NodeAddCopy( playlist_t *, playlist_item_t *, playlist_item_t *, int );
diff --git a/modules/control/win_msg.c b/modules/control/win_msg.c
index e0b5c47..6b1dd52 100644
--- a/modules/control/win_msg.c
+++ b/modules/control/win_msg.c
@@ -102,7 +102,7 @@ static LRESULT CALLBACK WMCOPYWNDPROC(HWND hwnd, UINT uMsg,
                         (psz_URI != NULL) ? psz_URI : ppsz_argv[i_opt],
                         NULL,
                         ( ( i_opt || p_data->enqueue ) ? 0 : PLAYLIST_GO ),
-                        PLAYLIST_END, -1,
+                        PLAYLIST_END,
                         i_options,
                         (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
                         VLC_INPUT_OPTION_TRUSTED,
diff --git a/modules/gui/qt/recents.cpp b/modules/gui/qt/recents.cpp
index 75c6bff..82dff23 100644
--- a/modules/gui/qt/recents.cpp
+++ b/modules/gui/qt/recents.cpp
@@ -237,7 +237,6 @@ int Open::openMRLwithOptions( intf_thread_t* p_intf,
                   qtu(mrl), title,
                   (b_start ? PLAYLIST_GO : 0),
                   PLAYLIST_END,
-                  -1,
                   i_options, ppsz_options, VLC_INPUT_OPTION_TRUSTED,
                   b_playlist );
 
diff --git a/src/interface/interface.c b/src/interface/interface.c
index 09ad080..f71790b 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -162,7 +162,7 @@ void intf_InsertItem(libvlc_int_t *libvlc, const char *mrl, unsigned optc,
                      const char *const *optv, unsigned flags)
 {
     playlist_AddExt(intf_GetPlaylist(libvlc), mrl, NULL, 0,
-                    0, -1, optc, optv, flags, true);
+                    0, optc, optv, flags, true);
 }
 
 void libvlc_InternalPlay(libvlc_int_t *libvlc)
diff --git a/src/os2/specific.c b/src/os2/specific.c
index 59df87a..530211b 100644
--- a/src/os2/specific.c
+++ b/src/os2/specific.c
@@ -100,7 +100,7 @@ static void IPCHelperThread( void *arg )
                 playlist_AddExt( p_playlist, ppsz_argv[ i_opt ], NULL,
                                  (( i_opt || ulCmd == IPC_CMD_ENQUEUE ) ?
                                      0 : PLAYLIST_GO ),
-                                 PLAYLIST_END, -1, i_options,
+                                 PLAYLIST_END, i_options,
                                  ( char const ** )
                                      ( i_options ? &ppsz_argv[ i_opt + 1 ] :
                                                    NULL ),
diff --git a/src/playlist/item.c b/src/playlist/item.c
index fdb9e7d..a956f93 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -459,7 +459,7 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
                   bool b_playlist )
 {
     return playlist_AddExt( p_playlist, psz_uri, psz_name,
-                            i_mode, i_pos, -1, 0, NULL, 0, b_playlist );
+                            i_mode, i_pos, 0, NULL, 0, b_playlist );
 }
 
 /**
@@ -472,7 +472,6 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
  * \param i_pos the position in the playlist where to add. If this is
  *        PLAYLIST_END the item will be added at the end of the playlist
  *        regardless of its size
- * \param i_duration length of the item in milliseconds.
  * \param i_options the number of options
  * \param ppsz_options an array of options
  * \param i_option_flags options flags
@@ -481,7 +480,6 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
 */
 int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
                      const char *psz_name, int i_mode, int i_pos,
-                     mtime_t i_duration,
                      int i_options, const char *const *ppsz_options,
                      unsigned i_option_flags,
                      bool b_playlist )
@@ -489,8 +487,7 @@ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
     int i_ret;
     input_item_t *p_input;
 
-    p_input = input_item_NewExt( psz_uri, psz_name, i_duration,
-                                 ITEM_TYPE_UNKNOWN, ITEM_NET_UNKNOWN );
+    p_input = input_item_New( psz_uri, psz_name );
     if( p_input == NULL )
         return VLC_ENOMEM;
     input_item_AddOptions( p_input, i_options, ppsz_options, i_option_flags );