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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Nov 16 23:42:00 2016 +0200| [b46ae2a9398def500867ad8583d8af3d12bb8f14] | committer: Rémi Denis-Courmont

playlist: remove locked parameter to playlist_AddExt()

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

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

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 477a3dc..eda3a6c 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -334,7 +334,7 @@ VLC_API int playlist_DeleteFromInput( playlist_t *, input_item_t *, bool );
 
 /******************** 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, 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_AddInput( playlist_t *, input_item_t *, int, int, bool, 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 aa18423..b8bc2ce 100644
--- a/modules/control/win_msg.c
+++ b/modules/control/win_msg.c
@@ -106,7 +106,7 @@ static LRESULT CALLBACK WMCOPYWNDPROC(HWND hwnd, UINT uMsg,
                         i_options,
                         (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
                         VLC_INPUT_OPTION_TRUSTED,
-                        true, pl_Unlocked );
+                        true );
 
                 i_opt += i_options;
                 free( psz_URI );
diff --git a/modules/gui/qt/recents.cpp b/modules/gui/qt/recents.cpp
index ff75e56..792a62c 100644
--- a/modules/gui/qt/recents.cpp
+++ b/modules/gui/qt/recents.cpp
@@ -239,8 +239,7 @@ int Open::openMRLwithOptions( intf_thread_t* p_intf,
                   PLAYLIST_END,
                   -1,
                   i_options, ppsz_options, VLC_INPUT_OPTION_TRUSTED,
-                  b_playlist,
-                  pl_Unlocked );
+                  b_playlist );
 
     /* Add to recent items, only if played */
     if( i_ret == VLC_SUCCESS && b_start && b_playlist )
diff --git a/src/interface/interface.c b/src/interface/interface.c
index bd00402..8b7914d 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, PLAYLIST_INSERT,
-                    0, -1, optc, optv, flags, true, pl_Unlocked);
+                    0, -1, optc, optv, flags, true);
 }
 
 void libvlc_InternalPlay(libvlc_int_t *libvlc)
diff --git a/src/os2/specific.c b/src/os2/specific.c
index dac2ad9..989e62e 100644
--- a/src/os2/specific.c
+++ b/src/os2/specific.c
@@ -106,7 +106,7 @@ static void IPCHelperThread( void *arg )
                                      ( i_options ? &ppsz_argv[ i_opt + 1 ] :
                                                    NULL ),
                                  VLC_INPUT_OPTION_TRUSTED,
-                                 true, pl_Unlocked );
+                                 true );
             }
 
             for( ; i_options >= 0; i_options-- )
diff --git a/src/playlist/item.c b/src/playlist/item.c
index 5a012e4..8bf8e71 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -384,7 +384,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, false );
+                            i_mode, i_pos, -1, 0, NULL, 0, b_playlist );
 }
 
 /**
@@ -402,7 +402,6 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
  * \param ppsz_options an array of options
  * \param i_option_flags options flags
  * \param b_playlist TRUE for playlist, FALSE for media library
- * \param b_locked TRUE if the playlist is locked
  * \return VLC_SUCCESS or a VLC error code
 */
 int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
@@ -410,7 +409,7 @@ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
                      mtime_t i_duration,
                      int i_options, const char *const *ppsz_options,
                      unsigned i_option_flags,
-                     bool b_playlist, bool b_locked )
+                     bool b_playlist )
 {
     int i_ret;
     input_item_t *p_input;
@@ -420,8 +419,8 @@ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
     if( p_input == NULL )
         return VLC_ENOMEM;
     input_item_AddOptions( p_input, i_options, ppsz_options, i_option_flags );
-    i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist,
-                               b_locked );
+    i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos,
+                               b_playlist, false );
     vlc_gc_decref( p_input );
     return i_ret;
 }