Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
415ada5a
Commit
415ada5a
authored
Jul 25, 2008
by
ivoire
Browse files
Use pl_Release with the right argument.
parent
c0538c2c
Changes
32
Hide whitespace changes
Inline
Side-by-side
modules/access/directory.c
View file @
415ada5a
...
...
@@ -227,7 +227,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
{
msg_Err
(
p_access
,
"unable to find item in playlist"
);
vlc_object_release
(
p_input
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
access
);
return
VLC_ENOOBJ
;
}
...
...
modules/access_output/http.c
View file @
415ada5a
...
...
@@ -309,7 +309,7 @@ static int Open( vlc_object_t *p_this )
if
(
psz_file_name
&&
asprintf
(
&
psz_txt
,
"path=%s"
,
psz_file_name
)
==
-
1
)
{
pl_Release
(
p_
playlist
);
pl_Release
(
p_
access
);
free
(
psz_uri
);
return
VLC_ENOMEM
;
}
...
...
@@ -323,7 +323,7 @@ static int Open( vlc_object_t *p_this )
if
(
p_sys
->
p_bonjour
==
NULL
)
msg_Err
(
p_access
,
"unable to start requested Bonjour announce"
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
access
);
}
else
p_sys
->
p_bonjour
=
NULL
;
...
...
modules/control/dbus.c
View file @
415ada5a
...
...
@@ -309,7 +309,7 @@ DBUS_METHOD( Pause )
REPLY_INIT
;
playlist_t
*
p_playlist
=
pl_Yield
(
(
vlc_object_t
*
)
p_this
);
playlist_Pause
(
p_playlist
);
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
REPLY_SEND
;
}
...
...
@@ -333,7 +333,7 @@ DBUS_METHOD( Play )
else
playlist_Play
(
p_playlist
);
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
REPLY_SEND
;
}
...
...
@@ -346,7 +346,7 @@ DBUS_METHOD( GetCurrentMetadata )
if
(
p_playlist
->
status
.
p_item
)
GetInputMeta
(
p_playlist
->
status
.
p_item
->
p_input
,
&
args
);
PL_UNLOCK
;
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
REPLY_SEND
;
}
...
...
@@ -410,7 +410,7 @@ DBUS_METHOD( AddTrack )
playlist_Add
(
p_playlist
,
psz_mrl
,
NULL
,
PLAYLIST_APPEND
|
(
(
b_play
==
TRUE
)
?
PLAYLIST_GO
:
0
)
,
PLAYLIST_END
,
true
,
false
);
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
dbus_int32_t
i_success
=
0
;
ADD_INT32
(
&
i_success
);
...
...
@@ -425,7 +425,7 @@ DBUS_METHOD( GetCurrentTrack )
playlist_t
*
p_playlist
=
pl_Yield
(
(
vlc_object_t
*
)
p_this
);
dbus_int32_t
i_position
=
p_playlist
->
i_current_index
;
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
ADD_INT32
(
&
i_position
);
REPLY_SEND
;
...
...
@@ -450,7 +450,7 @@ DBUS_METHOD( GetMetadata )
if
(
dbus_error_is_set
(
&
error
)
)
{
PL_UNLOCK
;
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
error
.
message
);
dbus_error_free
(
&
error
);
...
...
@@ -463,7 +463,7 @@ DBUS_METHOD( GetMetadata )
}
PL_UNLOCK
;
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
REPLY_SEND
;
}
...
...
@@ -474,7 +474,7 @@ DBUS_METHOD( GetLength )
playlist_t
*
p_playlist
=
pl_Yield
(
(
vlc_object_t
*
)
p_this
);
dbus_int32_t
i_elements
=
p_playlist
->
current
.
i_size
;
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
ADD_INT32
(
&
i_elements
);
REPLY_SEND
;
...
...
@@ -511,7 +511,7 @@ DBUS_METHOD( DelTrack )
}
PL_UNLOCK
;
pl_Release
(
p_playl
is
t
);
pl_Release
(
(
vlc_object_t
*
)
p_th
is
);
REPLY_SEND
;
}
...
...
@@ -772,7 +772,7 @@ static int Open( vlc_object_t *p_this )
var_AddCallback
(
p_playlist
,
"repeat"
,
StatusChangeEmit
,
p_intf
);
var_AddCallback
(
p_playlist
,
"loop"
,
StatusChangeEmit
,
p_intf
);
PL_UNLOCK
;
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
p_intf
->
pf_run
=
Run
;
p_intf
->
p_sys
=
p_sys
;
...
...
@@ -813,7 +813,7 @@ static void Close ( vlc_object_t *p_this )
}
PL_UNLOCK
;
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
dbus_connection_unref
(
p_intf
->
p_sys
->
p_conn
);
...
...
@@ -855,7 +855,7 @@ DBUS_SIGNAL( TrackListChangeSignal )
playlist_t
*
p_playlist
=
pl_Yield
(
(
vlc_object_t
*
)
p_data
);
dbus_int32_t
i_elements
=
p_playlist
->
current
.
i_size
;
pl_Release
(
p_playlist
);
pl_Release
(
(
vlc_object_t
*
)
p_data
);
ADD_INT32
(
&
i_elements
);
SIGNAL_SEND
;
...
...
@@ -1000,12 +1000,12 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var,
if
(
!
p_input
)
{
PL_UNLOCK
;
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
VLC_SUCCESS
;
}
vlc_object_yield
(
p_input
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
p_item
=
input_GetItem
(
p_input
);
if
(
!
p_item
)
...
...
@@ -1033,7 +1033,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
{
intf_sys_t
*
p_sys
=
p_intf
->
p_sys
;
dbus_int32_t
i_caps
=
CAPS_CAN_HAS_TRACKLIST
;
playlist_t
*
p_playlist
=
pl_Yield
(
(
vlc_object_t
*
)
p_intf
);
playlist_t
*
p_playlist
=
pl_Yield
(
p_intf
);
if
(
!
b_playlist_locked
)
PL_LOCK
;
if
(
p_playlist
->
current
.
i_size
>
0
)
...
...
@@ -1050,7 +1050,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
}
if
(
!
b_playlist_locked
)
PL_UNLOCK
;
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
if
(
p_sys
->
b_meta_read
)
i_caps
|=
CAPS_CAN_PROVIDE_METADATA
;
...
...
@@ -1158,7 +1158,7 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args,
playlist_t
*
p_playlist
=
NULL
;
input_thread_t
*
p_input
=
NULL
;
p_playlist
=
pl_Yield
(
(
vlc_object_t
*
)
p_intf
);
p_playlist
=
pl_Yield
(
p_intf
);
if
(
lock
)
PL_LOCK
;
...
...
@@ -1184,7 +1184,7 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args,
if
(
lock
)
PL_UNLOCK
;
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
dbus_message_iter_open_container
(
args
,
DBUS_TYPE_STRUCT
,
NULL
,
&
status
);
dbus_message_iter_append_basic
(
&
status
,
DBUS_TYPE_INT32
,
&
i_state
);
...
...
modules/gui/beos/ListViews.cpp
View file @
415ada5a
...
...
@@ -694,7 +694,7 @@ PlaylistView::MouseDown( BPoint where )
if( p_playlist )
{
playlist_Goto( p_playlist, i );
pl_Release( p_
playlist
);
pl_Release( p_
intf
);
}
handled = true;
}
...
...
@@ -1085,7 +1085,7 @@ PlaylistView::_PlayingItem() const
}
BListItem * item = ItemAt( p_playlist->i_index );
pl_Release( p_
playlist
);
pl_Release( p_
intf
);
return item;
}
...
...
@@ -1109,7 +1109,7 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem )
playlist_Goto( p_playlist, i );
SetCurrent( i );
pl_Release( p_
playlist
);
pl_Release( p_
intf
);
break;
}
}
...
...
modules/gui/beos/PlayListWindow.cpp
View file @
415ada5a
...
...
@@ -294,7 +294,7 @@ PlayListWindow::UpdatePlaylist( bool rebuild )
p_playlist = pl_Yield( p_intf );
fListView->SetCurrent( p_playlist->i_index );
fListView->SetPlaying( p_playlist->status.i_status == PLAYLIST_RUNNING );
pl_Release( p_
playlist
);
pl_Release( p_
intf
);
_CheckItemsEnableState();
}
...
...
modules/gui/pda/pda.c
View file @
415ada5a
...
...
@@ -296,7 +296,7 @@ static void Run( intf_thread_t *p_intf )
PlaylistRebuildListStore
(
p_intf
,
p_playlist_store
,
p_playlist
);
gtk_tree_view_set_model
(
GTK_TREE_VIEW
(
p_intf
->
p_sys
->
p_tvplaylist
),
GTK_TREE_MODEL
(
p_playlist_store
));
g_object_unref
(
p_playlist_store
);
pl_Release
(
p_
playlist
);
/* Free the playlist */
pl_Release
(
p_
intf
);
/* Free the playlist */
gtk_tree_selection_set_mode
(
gtk_tree_view_get_selection
(
GTK_TREE_VIEW
(
p_intf
->
p_sys
->
p_tvplaylist
)),
GTK_SELECTION_MULTIPLE
);
/* Column properties */
...
...
@@ -436,7 +436,7 @@ static int Manage( intf_thread_t *p_intf )
PlaylistRebuildListStore
(
p_intf
,
p_liststore
,
p_playlist
);
gtk_tree_view_set_model
(
p_intf
->
p_sys
->
p_tvplaylist
,
(
GtkTreeModel
*
)
p_liststore
);
g_object_unref
(
p_liststore
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/* Manage the slider */
...
...
modules/gui/pda/pda_callbacks.c
View file @
415ada5a
...
...
@@ -146,7 +146,7 @@ static void PlaylistAddItem(GtkWidget *widget, gchar *name, char **ppsz_options,
free
(
ppsz_options
);
}
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
PlaylistRebuildListStore
(
intf_thread_t
*
p_intf
,
...
...
@@ -393,7 +393,7 @@ void onPlay(GtkButton *button, gpointer user_data)
{
vlc_object_unlock
(
p_playlist
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
}
...
...
@@ -404,7 +404,7 @@ void onStop(GtkButton *button, gpointer user_data)
if
(
p_playlist
)
{
playlist_Stop
(
p_playlist
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
gdk_window_raise
(
p_intf
->
p_sys
->
p_window
->
window
);
}
}
...
...
@@ -802,7 +802,7 @@ void onPlaylistRow(GtkTreeView *treeview, GtkTreePath *path,
i_skip
=
i_row
-
p_playlist
->
i_current_index
;
playlist_Skip
(
p_playlist
,
i_skip
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
...
...
@@ -834,7 +834,7 @@ void onUpdatePlaylist(GtkButton *button, gpointer user_data)
g_object_unref
(
p_model
);
}
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
static
void
deleteItemFromPlaylist
(
gpointer
data
,
gpointer
user_data
)
...
...
@@ -907,7 +907,7 @@ void onDeletePlaylist(GtkButton *button, gpointer user_data)
g_object_unref
(
p_store
);
}
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
...
...
@@ -927,7 +927,7 @@ void onClearPlaylist(GtkButton *button, gpointer user_data)
{
msg_Err
(
p_playlist
,
"fix pda delete"
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
// Remove all entries from the Playlist widget.
p_tvplaylist
=
(
GtkTreeView
*
)
lookup_widget
(
GTK_WIDGET
(
button
),
"tvPlaylist"
);
...
...
modules/gui/qt4/components/info_panels.cpp
View file @
415ada5a
...
...
@@ -291,7 +291,7 @@ void MetaPanel::saveMeta()
if
(
p_mod
)
module_Unneed
(
p_playlist
,
p_mod
);
PL_UNLOCK
;
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
/* Reset the status of the mode. No need to emit any signal because parent
is the only caller */
...
...
modules/gui/wince/dialogs.cpp
View file @
415ada5a
...
...
@@ -366,7 +366,7 @@ void DialogsProvider::OnOpenFileSimple( int i_arg )
PLAYLIST_APPEND
|
(
i_arg
?
PLAYLIST_GO
:
0
),
PLAYLIST_END
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
DialogsProvider
::
OnOpenDirectory
(
int
i_arg
)
...
...
@@ -431,7 +431,7 @@ void DialogsProvider::OnOpenDirectory( int i_arg )
error:
if
(
p_malloc
)
p_malloc
->
Release
();
if
(
p_playlist
)
pl_Release
(
p_
playlist
);
if
(
p_playlist
)
pl_Release
(
p_
intf
);
#ifdef UNDER_CE
FreeLibrary
(
ceshell_dll
);
...
...
modules/gui/wince/interface.cpp
View file @
415ada5a
...
...
@@ -652,7 +652,7 @@ void Interface::OnPlayStream( void )
/* No stream was playing, start one */
playlist_Play
(
p_playlist
);
TogglePlayButton
(
PLAYING_S
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
;
}
...
...
@@ -678,7 +678,7 @@ void Interface::OnPlayStream( void )
/* If the playlist is empty, open a file requester instead */
OnShowDialog
(
ID_FILE_QUICKOPEN
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Interface
::
TogglePlayButton
(
int
i_playing_status
)
...
...
@@ -815,7 +815,7 @@ void Interface::OnStopStream( void )
playlist_Stop
(
p_playlist
);
TogglePlayButton
(
PAUSE_S
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Interface
::
OnPrevStream
(
void
)
...
...
@@ -824,7 +824,7 @@ void Interface::OnPrevStream( void )
if
(
p_playlist
==
NULL
)
return
;
playlist_Prev
(
p_playlist
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Interface
::
OnNextStream
(
void
)
...
...
@@ -833,7 +833,7 @@ void Interface::OnNextStream( void )
if
(
p_playlist
==
NULL
)
return
;
playlist_Next
(
p_playlist
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Interface
::
OnSlowStream
(
void
)
...
...
modules/gui/wince/iteminfo.cpp
View file @
415ada5a
...
...
@@ -273,7 +273,7 @@ void ItemInfoDialog::OnOk()
if
(
p_playlist
!=
NULL
)
{
b_state
=
SendMessage
(
enabled_checkbox
,
BM_GETCHECK
,
0
,
0
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
p_item
->
b_enabled
=
(
b_state
&
BST_CHECKED
)
?
true
:
false
;
...
...
modules/gui/wince/menus.cpp
View file @
415ada5a
...
...
@@ -227,7 +227,7 @@ void PopupMenu( intf_thread_t *p_intf, HWND p_parent, POINT point )
AppendMenu
(
hmenu
,
MF_SEPARATOR
,
0
,
_T
(
""
)
);
AppendMenu
(
hmenu
,
MF_STRING
,
PlayStream_Event
,
_T
(
"Play"
)
);
}
if
(
p_playlist
)
pl_Release
(
p_
playlist
);
if
(
p_playlist
)
pl_Release
(
p_
intf
);
}
AppendMenu
(
hmenu
,
MF_POPUP
|
MF_STRING
,
(
UINT
)
MiscMenu
(
p_intf
),
...
...
modules/gui/wince/open.cpp
View file @
415ada5a
...
...
@@ -655,7 +655,7 @@ void OpenDialog::OnOk()
free
(
pp_args
[
i_args
]
);
if
(
!
i_args
)
free
(
pp_args
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/*****************************************************************************
...
...
modules/gui/wince/playlist.cpp
View file @
415ada5a
...
...
@@ -303,7 +303,7 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
bState
=
val
.
b_bool
?
TBSTATE_CHECKED
:
0
;
SendMessage
(
hwndTB
,
TB_SETSTATE
,
Repeat_Event
,
MAKELONG
(
bState
|
TBSTATE_ENABLED
,
0
)
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
GetClientRect
(
hwnd
,
&
rect
);
hListView
=
CreateWindow
(
WC_LISTVIEW
,
NULL
,
WS_VISIBLE
|
WS_CHILD
|
...
...
@@ -521,7 +521,7 @@ LRESULT Playlist::ProcessCustomDraw( LPARAM lParam )
if
(
(
int
)
lplvcd
->
nmcd
.
dwItemSpec
==
p_playlist
->
i_index
)
{
lplvcd
->
clrText
=
RGB
(
255
,
0
,
0
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
CDRF_NEWFONT
;
}
...
...
@@ -529,16 +529,16 @@ LRESULT Playlist::ProcessCustomDraw( LPARAM lParam )
(
int
)
lplvcd
->
nmcd
.
dwItemSpec
);
if
(
!
p_item
)
{
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
CDRF_DODEFAULT
;
}
if
(
p_item
->
b_enabled
==
false
)
{
lplvcd
->
clrText
=
RGB
(
192
,
192
,
192
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
CDRF_NEWFONT
;
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
return
CDRF_DODEFAULT
;
...
...
@@ -604,7 +604,7 @@ void Playlist::UpdatePlaylist()
}
vlc_object_unlock
(
p_playlist
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/**********************************************************************
...
...
@@ -645,7 +645,7 @@ void Playlist::Rebuild()
ListView_SetItemState
(
hListView
,
i_focused
,
LVIS_FOCUSED
,
LVIS_STATEIMAGEMASK
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/**********************************************************************
...
...
@@ -661,7 +661,7 @@ void Playlist::UpdateItem( int i )
if
(
!
p_item
)
{
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
;
}
...
...
@@ -677,7 +677,7 @@ void Playlist::UpdateItem( int i )
ListView_SetItemText
(
hListView
,
i
,
3
,
_FROMMB
(
psz_duration
)
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/**********************************************************************
...
...
@@ -691,7 +691,7 @@ void Playlist::DeleteItem( int item )
playlist_Delete
(
p_playlist
,
item
);
ListView_DeleteItem
(
hListView
,
item
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/**********************************************************************
...
...
@@ -708,7 +708,7 @@ static void OnOpenCB( intf_dialog_args_t *p_arg )
if
(
p_playlist
)
{
playlist_Import
(
p_playlist
,
p_arg
->
psz_results
[
0
]
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
}
}
...
...
@@ -747,7 +747,7 @@ static void OnSaveCB( intf_dialog_args_t *p_arg )
else
psz_export
=
"export-m3u"
;
playlist_Export
(
p_playlist
,
p_arg
->
psz_results
[
0
],
psz_export
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
}
}
...
...
@@ -814,7 +814,7 @@ void Playlist::OnEnableSelection()
UpdateItem
(
item
);
}
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Playlist
::
OnDisableSelection
()
...
...
@@ -834,7 +834,7 @@ void Playlist::OnDisableSelection()
UpdateItem
(
item
);
}
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Playlist
::
OnSelectAll
()
...
...
@@ -853,7 +853,7 @@ void Playlist::OnActivateItem( int i_item )
playlist_Goto
(
p_playlist
,
i_item
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Playlist
::
ShowInfos
(
HWND
hwnd
,
int
i_item
)
...
...
@@ -874,7 +874,7 @@ void Playlist::ShowInfos( HWND hwnd, int i_item )
delete
iteminfo_dialog
;
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/********************************************************************
...
...
@@ -903,7 +903,7 @@ void Playlist::OnUp()
LVIS_STATEIMAGEMASK
);
}
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
;
}
...
...
@@ -923,7 +923,7 @@ void Playlist::OnDown()
ListView_SetItemState
(
hListView
,
i_item
+
1
,
LVIS_FOCUSED
,
LVIS_STATEIMAGEMASK
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
return
;
}
...
...
@@ -941,7 +941,7 @@ void Playlist::OnRandom()
if
(
p_playlist
==
NULL
)
return
;
var_Set
(
p_playlist
,
"random"
,
val
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Playlist
::
OnLoop
()
...
...
@@ -954,7 +954,7 @@ void Playlist::OnLoop ()
if
(
p_playlist
==
NULL
)
return
;
var_Set
(
p_playlist
,
"loop"
,
val
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Playlist
::
OnRepeat
()
...
...
@@ -967,7 +967,7 @@ void Playlist::OnRepeat ()
if
(
p_playlist
==
NULL
)
return
;
var_Set
(
p_playlist
,
"repeat"
,
val
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
/********************************************************************
...
...
@@ -997,7 +997,7 @@ void Playlist::OnSort( UINT event )
break
;
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
b_need_update
=
true
;
...
...
@@ -1039,7 +1039,7 @@ void Playlist::OnColSelect( int iSubItem )
break
;
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
b_need_update
=
true
;
...
...
@@ -1062,7 +1062,7 @@ void Playlist::OnPopupPlay()
playlist_Goto
(
p_playlist
,
i_popup_item
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
Playlist
::
OnPopupDel
()
...
...
@@ -1094,7 +1094,7 @@ void Playlist::OnPopupEna()
playlist_Enable
(
p_playlist
,
p_item
);
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
UpdateItem
(
i_popup_item
);
}
...
...
modules/gui/wince/timer.cpp
View file @
415ada5a
...
...
@@ -56,7 +56,7 @@ Timer::Timer( intf_thread_t *_p_intf, HWND hwnd, Interface *_p_main_interface)
if
(
p_playlist
!=
NULL
)
{
var_AddCallback
(
p_playlist
,
"intf-popupmenu"
,
PopupMenuCB
,
p_intf
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
SetTimer
(
hwnd
,
1
,
200
/*milliseconds*/
,
NULL
);
...
...
@@ -69,7 +69,7 @@ Timer::~Timer()
if
(
p_playlist
!=
NULL
)
{
var_DelCallback
(
p_playlist
,
"intf-popupmenu"
,
PopupMenuCB
,
p_intf
);
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
}
...
...
modules/gui/wxwidgets/dialogs.cpp
View file @
415ada5a
...
...
@@ -471,7 +471,7 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
wxLocaleFree
(
psz_utf8
);
}
}
pl_Release
(
p_
playlist
);
pl_Release
(
p_
intf
);
}
void
DialogsProvider
::
OnOpenDirectory
(
wxCommandEvent
&
event
)
...
...
@@ -494,7 +494,7 @@ void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )