Changeset 1c94ebe4d604b51644f9a129c3aa40f81ed6a97b

Timestamp:

21/07/08 18:36:50 (4 months ago)

Author:

Rémi Duraffort <ivoire@videolan.org>

git-committer:

Rémi Duraffort <ivoire@videolan.org> 1216658210 +0200

git-parent:

[64868251fe44f3659459c254df6928f170d15b89]

git-author:

Rémi Duraffort <ivoire@videolan.org> 1216657524 +0200

Message:

Use pl_Release an factorise two lines.

Files:

• modules/misc/lua/libs/input.c (modified) (1 diff)
• modules/misc/lua/libs/playlist.c (modified) (20 diffs)
• modules/misc/lua/libs/sd.c (modified) (3 diffs)
• modules/misc/notify/growl.m (modified) (1 diff)
• modules/misc/notify/growl_udp.c (modified) (1 diff)
• modules/misc/notify/xosd.c (modified) (3 diffs)

modules/misc/lua/libs/input.c

@@ -52 +52 @@
-    input_thread_t *p_input = p_playlist->p_input;
-    if( p_input ) vlc_object_yield( p_input );
-vlc_object_r
+pl_R
-    return p_input;
-}

modules/misc/lua/libs/playlist.c

@@ -59 +59 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    playlist_Prev( p_playlist );
-vlc_object_r
+pl_R
-    return 0;
-}
@@ -67 +67 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    playlist_Next( p_playlist );
-vlc_object_r
+pl_R
-    return 0;
-}
@@ -76 +76 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    playlist_Skip( p_playlist, i_skip );
-vlc_object_r
+pl_R
-    return 0;
-}
@@ -84 +84 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    playlist_Play( p_playlist );
-vlc_object_r
+pl_R
-    return 0;
-}
@@ -92 +92 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    playlist_Pause( p_playlist );
-vlc_object_r
+pl_R
-    return 0;
-}
@@ -100 +100 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    playlist_Stop( p_playlist );
-vlc_object_r
+pl_R
-    return 0;
-}
@@ -109 +109 @@
-    playlist_Stop( p_playlist ); /* Isn't this already implied by Clear? */
-    playlist_Clear( p_playlist, pl_Unlocked );
-vlc_object_r
+pl_R
-    return 0;
-}
@@ -117 +117 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "repeat" );
-vlc_object_r
+pl_R
-    return i_ret;
-}
@@ -125 +125 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "loop" );
-vlc_object_r
+pl_R
-    return i_ret;
-}
@@ -133 +133 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "random" );
-vlc_object_r
+pl_R
-    return i_ret;
-}
@@ -145 +145 @@
-                                  playlist_ItemGetById( p_playlist, i_id,
-                                                        true ) );
-vlc_object_r
+pl_R
-    return vlclua_push_ret( L, i_ret );
-}
@@ -156 +156 @@
-    i_count = vlclua_playlist_add_internal( p_this, L, p_playlist,
-                                            NULL, true );
-vlc_object_r
+pl_R
-    lua_pushinteger( L, i_count );
-    return 1;
@@ -168 +168 @@
-    i_count = vlclua_playlist_add_internal( p_this, L, p_playlist,
-                                            NULL, false );
-vlc_object_r
+pl_R
-    lua_pushinteger( L, i_count );
-    return 1;
@@ -236 +236 @@
-        if( !p_item )
-        {
-vlc_object_r
+pl_R
-            return 0; /* Should we return an error instead? */
-        }
@@ -269 +269 @@
-            if( !p_item )
-            {
-vlc_object_r
+pl_R
-                return 0; /* Should we return an error instead? */
-            }
@@ -280 +280 @@
-    }
-    push_playlist_item( L, p_item );
-vlc_object_r
+pl_R
-    return 1;
-}
@@ -293 +293 @@
-    playlist_LiveSearchUpdate( p_playlist, p_item, psz_string );
-    push_playlist_item( L, p_item );
-vlc_object_r
+pl_R
-    return 1;
-}
@@ -301 +301 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    lua_pushinteger( L, var_GetInteger( p_playlist, "playlist-current" ) );
-vlc_object_r
+pl_R
-    return 1;
-}
@@ -344 +344 @@
-    int i_ret = playlist_RecursiveNodeSort( p_playlist, p_root, i_mode,
-                                            i_type );
-vlc_object_r
+pl_R
-    return vlclua_push_ret( L, i_ret );
-}
@@ -386 +386 @@
-        lua_pushstring( L, "stopped" );
-    }
-vlc_object_r
+pl_R
-    return 1;
-}

modules/misc/lua/libs/sd.c

@@ -77 +77 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    int i_ret = playlist_ServicesDiscoveryAdd( p_playlist, psz_sd );
-vlc_object_r
+pl_R
-    return vlclua_push_ret( L, i_ret );
-}
@@ -86 +86 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    int i_ret = playlist_ServicesDiscoveryRemove( p_playlist, psz_sd );
-vlc_object_r
+pl_R
-    return vlclua_push_ret( L, i_ret );
-}
@@ -95 +95 @@
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    lua_pushboolean( L, playlist_IsServicesDiscoveryLoaded( p_playlist, psz_sd ));
-vlc_object_r
+pl_R
-    return 1;
-}

modules/misc/notify/growl.m

@@ -163 +163 @@
-
-    p_input = p_playlist->p_input;
-vlc_object_r
+pl_R
-
-    if( !p_input ) return VLC_SUCCESS;

modules/misc/notify/growl_udp.c

@@ -125 +125 @@
-
-    p_input = p_playlist->p_input;
-vlc_object_r
+pl_R
-
-    if( !p_input ) return VLC_SUCCESS;

modules/misc/notify/xosd.c

@@ -221 +221 @@
-            if( playlist_IsEmpty( p_playlist ) )
-            {
-vlc_object_r
+pl_R
-                continue;
-            }
@@ -229 +229 @@
-            {
-                psz_display = strdup(_("Stop"));
-vlc_object_r
+pl_R
-            }
-            else if( p_playlist->status.i_status == PLAYLIST_PAUSED )
-            {
-                psz_display = strdup(_("Pause"));
-vlc_object_r
+pl_R
-            }
-            else
@@ -240 +240 @@
-                p_item = p_playlist->status.p_item;
-                p_input = p_item->p_input;
+
+                pl_Release( p_playlist );
-                if( !p_item )
-                {
-                    vlc_object_release( p_playlist );
-                    continue;
-                }
-
-                vlc_object_release( p_playlist );
-
-                mtime_t i_duration = input_item_GetDuration( p_input );