Remove pl_Release, and rename pl_Hold back to pl_Get

[vlc] / modules / misc / lua / libs / playlist.c

diff --git a/modules/misc/lua/libs/playlist.c b/modules/misc/lua/libs/playlist.c
index 4c72931744db61997df864e1c9ea0e5953223669..b376ba51548ed36099c6850582473db3dd109346 100644 (file)
--- a/modules/misc/lua/libs/playlist.c
+++ b/modules/misc/lua/libs/playlist.c
@@ -51,19 +51,13 @@
 playlist_t *vlclua_get_playlist_internal( lua_State *L )
 {
     vlc_object_t *p_this = vlclua_get_this( L );
-    return pl_Hold( p_this );
-}
-
-void vlclua_release_playlist_internal( playlist_t *p_playlist )
-{
-    vlc_object_release( p_playlist );
+    return pl_Get( p_this );
 }
 
 static int vlclua_playlist_prev( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Prev( p_playlist );
-    vlclua_release_playlist_internal( p_playlist );
     return 0;
 }
 
@@ -71,7 +65,6 @@ static int vlclua_playlist_next( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Next( p_playlist );
-    vlclua_release_playlist_internal( p_playlist );
     return 0;
 }
 
@@ -80,7 +73,6 @@ static int vlclua_playlist_skip( lua_State * L )
     int i_skip = luaL_checkint( L, 1 );
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Skip( p_playlist, i_skip );
-    vlclua_release_playlist_internal( p_playlist );
     return 0;
 }
 
@@ -88,7 +80,6 @@ static int vlclua_playlist_play( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Play( p_playlist );
-    vlclua_release_playlist_internal( p_playlist );
     return 0;
 }
 
@@ -96,7 +87,6 @@ static int vlclua_playlist_pause( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Pause( p_playlist );
-    vlclua_release_playlist_internal( p_playlist );
     return 0;
 }
 
@@ -104,7 +94,6 @@ static int vlclua_playlist_stop( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Stop( p_playlist );
-    vlclua_release_playlist_internal( p_playlist );
     return 0;
 }
 
@@ -113,7 +102,6 @@ static int vlclua_playlist_clear( lua_State * L )
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Stop( p_playlist ); /* Isn't this already implied by Clear? */
     playlist_Clear( p_playlist, pl_Unlocked );
-    vlclua_release_playlist_internal( p_playlist );
     return 0;
 }
 
@@ -121,7 +109,6 @@ static int vlclua_playlist_repeat( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "repeat" );
-    vlclua_release_playlist_internal( p_playlist );
     return i_ret;
 }
 
@@ -129,7 +116,6 @@ static int vlclua_playlist_loop( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "loop" );
-    vlclua_release_playlist_internal( p_playlist );
     return i_ret;
 }
 
@@ -137,7 +123,6 @@ static int vlclua_playlist_random( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "random" );
-    vlclua_release_playlist_internal( p_playlist );
     return i_ret;
 }
 
@@ -150,7 +135,6 @@ static int vlclua_playlist_goto( lua_State * L )
                                   true, NULL,
                                   playlist_ItemGetById( p_playlist, i_id ) );
     PL_UNLOCK;
-    vlclua_release_playlist_internal( p_playlist );
     return vlclua_push_ret( L, i_ret );
 }
 
@@ -161,7 +145,6 @@ static int vlclua_playlist_add( lua_State *L )
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     i_count = vlclua_playlist_add_internal( p_this, L, p_playlist,
                                             NULL, true );
-    vlclua_release_playlist_internal( p_playlist );
     lua_pushinteger( L, i_count );
     return 1;
 }
@@ -173,7 +156,6 @@ static int vlclua_playlist_enqueue( lua_State *L )
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     i_count = vlclua_playlist_add_internal( p_this, L, p_playlist,
                                             NULL, false );
-    vlclua_release_playlist_internal( p_playlist );
     lua_pushinteger( L, i_count );
     return 1;
 }
@@ -243,7 +225,6 @@ static int vlclua_playlist_get( lua_State *L )
         if( !p_item )
         {
             PL_UNLOCK;
-            vlclua_release_playlist_internal( p_playlist );
             return 0; /* Should we return an error instead? */
         }
     }
@@ -266,7 +247,6 @@ static int vlclua_playlist_get( lua_State *L )
             if( !p_item )
             {
                 PL_UNLOCK;
-                vlclua_release_playlist_internal( p_playlist );
                 return 0; /* Should we return an error instead? */
             }
         }
@@ -277,7 +257,6 @@ static int vlclua_playlist_get( lua_State *L )
     }
     push_playlist_item( L, p_item );
     PL_UNLOCK;
-    vlclua_release_playlist_internal( p_playlist );
     return 1;
 }
 
@@ -289,7 +268,6 @@ static int vlclua_playlist_search( lua_State *L )
     playlist_LiveSearchUpdate( p_playlist, p_playlist->p_root, psz_string );
     PL_UNLOCK;
     push_playlist_item( L, p_playlist->p_root );
-    vlclua_release_playlist_internal( p_playlist );
     return 1;
 }
 
@@ -309,7 +287,6 @@ static int vlclua_playlist_current( lua_State *L )
 
 #warning Indexing input items by ID is unsafe,
     lua_pushinteger( L, id );
-    vlclua_release_playlist_internal( p_playlist );
     return 1;
 }
 
@@ -351,7 +328,6 @@ static int vlclua_playlist_sort( lua_State *L )
     int i_ret = playlist_RecursiveNodeSort( p_playlist, p_playlist->p_playing,
                                             i_mode, i_type );
     PL_UNLOCK;
-    vlclua_release_playlist_internal( p_playlist );
     return vlclua_push_ret( L, i_ret );
 }
 
@@ -375,7 +351,6 @@ static int vlclua_playlist_status( lua_State *L )
             break;
     }
     PL_UNLOCK;
-    vlclua_release_playlist_internal( p_playlist );
     return 1;
 }