[vlc-devel] commit: lua_libs: release the playlist object. ( Rémi Duraffort )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Mon Nov 16 22:17:00 2009 +0100| [70cddaa6a7c7d8e3dc1c9fc91bddcb5320f614f3] | committer: Rémi Duraffort 

lua_libs: release the playlist object.
(cherry picked from commit 49d423b347d68396a5abe0faa86993c6069f5c76)

Conflicts:

	modules/misc/lua/libs/volume.c

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

 modules/misc/lua/libs/volume.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/misc/lua/libs/volume.c b/modules/misc/lua/libs/volume.c
index 2ebd4a4..d95f0c9 100644
--- a/modules/misc/lua/libs/volume.c
+++ b/modules/misc/lua/libs/volume.c
@@ -54,7 +54,9 @@ static int vlclua_volume_set( lua_State *L )
     vlc_object_t *p_this = vlclua_get_this( L );
     int i_volume = luaL_checkint( L, 1 );
     /* Do we need to check that i_volume is in the AOUT_VOLUME_MIN->MAX range?*/
-    return vlclua_push_ret( L, aout_VolumeSet( p_this, i_volume ) );
+    int i_ret = aout_VolumeSet( p_this, i_volume );
+    vlclua_release_playlist_internal( p_this );
+    return vlclua_push_ret( L, i_ret );
 }
 
 static int vlclua_volume_get( lua_State *L )
@@ -65,26 +67,27 @@ static int vlclua_volume_get( lua_State *L )
         lua_pushnumber( L, i_volume );
     else
         lua_pushnil( L );
+    vlclua_release_playlist_internal( p_this );
     return 1;
 }
 
 static int vlclua_volume_up( lua_State *L )
 {
     audio_volume_t i_volume;
-    aout_VolumeUp( vlclua_get_this( L ),
-                   luaL_optint( L, 1, 1 ),
-                   &i_volume );
+    playlist_t *p_this = vlclua_get_playlist_internal( L );
+    aout_VolumeUp( p_this, luaL_optint( L, 1, 1 ), &i_volume );
     lua_pushnumber( L, i_volume );
+    vlclua_release_playlist_internal( p_this );
     return 1;
 }
 
 static int vlclua_volume_down( lua_State *L )
 {
     audio_volume_t i_volume;
-    aout_VolumeDown( vlclua_get_this( L ),
-                     luaL_optint( L, 1, 1 ),
-                     &i_volume );
+    playlist_t *p_this = vlclua_get_playlist_internal( L );
+    aout_VolumeDown( p_this, luaL_optint( L, 1, 1 ), &i_volume );
     lua_pushnumber( L, i_volume );
+    vlclua_release_playlist_internal( p_this );
     return 1;
 }