Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
6da90a17
Commit
6da90a17
authored
May 04, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vlc_mutex_init: remove unused paramter
parent
c9324503
Changes
71
Hide whitespace changes
Inline
Side-by-side
Showing
71 changed files
with
91 additions
and
93 deletions
+91
-93
include/vlc_threads_funcs.h
include/vlc_threads_funcs.h
+1
-1
modules/access/dshow/dshow.cpp
modules/access/dshow/dshow.cpp
+1
-1
modules/access/dv.c
modules/access/dv.c
+2
-2
modules/access/dvb/http.c
modules/access/dvb/http.c
+1
-1
modules/access/dvdnav.c
modules/access/dvdnav.c
+1
-1
modules/access/rtmp/access.c
modules/access/rtmp/access.c
+1
-1
modules/audio_output/alsa.c
modules/audio_output/alsa.c
+1
-1
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+1
-1
modules/audio_output/portaudio.c
modules/audio_output/portaudio.c
+2
-2
modules/codec/fake.c
modules/codec/fake.c
+1
-1
modules/codec/ffmpeg/encoder.c
modules/codec/ffmpeg/encoder.c
+1
-1
modules/control/rc.c
modules/control/rc.c
+1
-1
modules/demux/mkv.cpp
modules/demux/mkv.cpp
+2
-2
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+1
-1
modules/gui/skins2/commands/async_queue.cpp
modules/gui/skins2/commands/async_queue.cpp
+1
-1
modules/gui/wince/video.cpp
modules/gui/wince/video.cpp
+1
-1
modules/gui/wxwidgets/video.cpp
modules/gui/wxwidgets/video.cpp
+1
-1
modules/misc/audioscrobbler.c
modules/misc/audioscrobbler.c
+1
-1
modules/misc/freetype.c
modules/misc/freetype.c
+1
-1
modules/misc/gnutls.c
modules/misc/gnutls.c
+2
-2
modules/misc/notify/notify.c
modules/misc/notify/notify.c
+1
-1
modules/misc/rtsp.c
modules/misc/rtsp.c
+2
-2
modules/services_discovery/upnp_intel.cpp
modules/services_discovery/upnp_intel.cpp
+1
-1
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+3
-3
modules/stream_out/rtsp.c
modules/stream_out/rtsp.c
+1
-1
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+1
-1
modules/video_filter/alphamask.c
modules/video_filter/alphamask.c
+1
-1
modules/video_filter/atmo/AtmoDynData.cpp
modules/video_filter/atmo/AtmoDynData.cpp
+1
-1
modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
+1
-1
modules/video_filter/atmo/AtmoThread.cpp
modules/video_filter/atmo/AtmoThread.cpp
+1
-1
modules/video_filter/atmo/atmo.cpp
modules/video_filter/atmo/atmo.cpp
+1
-1
modules/video_filter/deinterlace.c
modules/video_filter/deinterlace.c
+1
-1
modules/video_filter/erase.c
modules/video_filter/erase.c
+1
-1
modules/video_filter/logo.c
modules/video_filter/logo.c
+1
-1
modules/video_filter/mosaic.c
modules/video_filter/mosaic.c
+1
-1
modules/video_filter/motiondetect.c
modules/video_filter/motiondetect.c
+1
-1
modules/video_filter/rss.c
modules/video_filter/rss.c
+1
-1
modules/video_output/msw/direct3d.c
modules/video_output/msw/direct3d.c
+1
-1
modules/video_output/msw/directx.c
modules/video_output/msw/directx.c
+1
-1
modules/video_output/msw/glwin32.c
modules/video_output/msw/glwin32.c
+1
-1
modules/video_output/msw/wingdi.c
modules/video_output/msw/wingdi.c
+1
-1
modules/video_output/x11/xcommon.c
modules/video_output/x11/xcommon.c
+1
-1
modules/visualization/goom.c
modules/visualization/goom.c
+1
-1
src/audio_output/common.c
src/audio_output/common.c
+3
-3
src/audio_output/dec.c
src/audio_output/dec.c
+1
-1
src/control/core.c
src/control/core.c
+2
-2
src/control/event.c
src/control/event.c
+1
-1
src/control/media_list.c
src/control/media_list.c
+1
-1
src/control/media_list_player.c
src/control/media_list_player.c
+1
-1
src/control/media_list_view.c
src/control/media_list_view.c
+1
-1
src/control/media_player.c
src/control/media_player.c
+1
-2
src/input/decoder.c
src/input/decoder.c
+1
-1
src/input/input.c
src/input/input.c
+2
-2
src/input/item.c
src/input/item.c
+1
-1
src/input/vlm.c
src/input/vlm.c
+1
-1
src/interface/interface.c
src/interface/interface.c
+1
-1
src/libvlc-common.c
src/libvlc-common.c
+3
-3
src/misc/block.c
src/misc/block.c
+1
-1
src/misc/darwin_specific.c
src/misc/darwin_specific.c
+1
-1
src/misc/events.c
src/misc/events.c
+1
-1
src/misc/messages.c
src/misc/messages.c
+2
-3
src/misc/objects.c
src/misc/objects.c
+3
-3
src/misc/stats.c
src/misc/stats.c
+1
-1
src/misc/update.c
src/misc/update.c
+1
-1
src/misc/variables.c
src/misc/variables.c
+1
-1
src/network/httpd.c
src/network/httpd.c
+3
-3
src/playlist/engine.c
src/playlist/engine.c
+1
-1
src/stream_output/sap.c
src/stream_output/sap.c
+1
-1
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+1
-1
src/video_output/video_output.c
src/video_output/video_output.c
+3
-3
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+1
-1
No files found.
include/vlc_threads_funcs.h
View file @
6da90a17
...
...
@@ -53,7 +53,7 @@ VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) );
/*****************************************************************************
* vlc_mutex_init: initialize a mutex
*****************************************************************************/
#define vlc_mutex_init(
P_THIS,
P_MUTEX ) \
#define vlc_mutex_init( P_MUTEX ) \
__vlc_mutex_init( P_MUTEX )
/*****************************************************************************
...
...
modules/access/dshow/dshow.cpp
View file @
6da90a17
...
...
@@ -418,7 +418,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
p_sys
->
p_capture_graph_builder2
=
NULL
;
p_sys
->
p_control
=
NULL
;
vlc_mutex_init
(
p_this
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
vlc_cond_init
(
p_this
,
&
p_sys
->
wait
);
/* Build directshow graph */
...
...
modules/access/dv.c
View file @
6da90a17
...
...
@@ -165,7 +165,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
p_frame
=
NULL
;
p_sys
->
p_ev
=
NULL
;
vlc_mutex_init
(
p_access
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
p_sys
->
i_node
=
DiscoverAVC
(
p_access
,
&
p_sys
->
i_port
,
p_sys
->
i_guid
);
if
(
p_sys
->
i_node
<
0
)
...
...
@@ -235,7 +235,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
p_ev
->
p_frame
=
NULL
;
p_sys
->
p_ev
->
pp_last
=
&
p_sys
->
p_ev
->
p_frame
;
p_sys
->
p_ev
->
p_access
=
p_access
;
vlc_mutex_init
(
p_access
,
&
p_sys
->
p_ev
->
lock
);
vlc_mutex_init
(
&
p_sys
->
p_ev
->
lock
);
vlc_thread_create
(
p_sys
->
p_ev
,
"dv event thread handler"
,
Raw1394EventThread
,
VLC_THREAD_PRIORITY_OUTPUT
,
false
);
...
...
modules/access/dvb/http.c
View file @
6da90a17
...
...
@@ -90,7 +90,7 @@ int E_(HTTPOpen)( access_t *p_access )
vlc_acl_t
*
p_acl
=
NULL
;
httpd_file_sys_t
*
f
;
vlc_mutex_init
(
p_access
,
&
p_sys
->
httpd_mutex
);
vlc_mutex_init
(
&
p_sys
->
httpd_mutex
);
vlc_cond_init
(
p_access
,
&
p_sys
->
httpd_cond
);
p_sys
->
b_request_frontend_info
=
p_sys
->
b_request_mmi_info
=
false
;
p_sys
->
i_httpd_timeout
=
0
;
...
...
modules/access/dvdnav.c
View file @
6da90a17
...
...
@@ -1223,7 +1223,7 @@ static int EventThread( vlc_object_t *p_this )
demux_sys_t
*
p_sys
=
p_ev
->
p_demux
->
p_sys
;
vlc_object_t
*
p_vout
=
NULL
;
vlc_mutex_init
(
p_ev
,
&
p_ev
->
lock
);
vlc_mutex_init
(
&
p_ev
->
lock
);
p_ev
->
b_moved
=
false
;
p_ev
->
b_clicked
=
false
;
p_ev
->
i_key_action
=
0
;
...
...
modules/access/rtmp/access.c
View file @
6da90a17
...
...
@@ -168,7 +168,7 @@ static int Open( vlc_object_t *p_this )
}
vlc_cond_init
(
p_sys
->
p_thread
,
&
p_sys
->
p_thread
->
wait
);
vlc_mutex_init
(
p_sys
->
p_thread
,
&
p_sys
->
p_thread
->
lock
);
vlc_mutex_init
(
&
p_sys
->
p_thread
->
lock
);
p_sys
->
p_thread
->
result_connect
=
1
;
p_sys
->
p_thread
->
result_play
=
1
;
...
...
modules/audio_output/alsa.c
View file @
6da90a17
...
...
@@ -319,7 +319,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
b_playing
=
false
;
p_sys
->
start_date
=
0
;
vlc_cond_init
(
p_aout
,
&
p_sys
->
wait
);
vlc_mutex_init
(
p_aout
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
/* Get device name */
if
(
(
psz_device
=
config_GetPsz
(
p_aout
,
"alsadev"
))
==
NULL
)
...
...
modules/audio_output/auhal.c
View file @
6da90a17
...
...
@@ -1195,7 +1195,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
/* Condition because SetProperty is asynchronious */
vlc_cond_init
(
p_aout
,
&
w
.
cond
);
vlc_mutex_init
(
p_aout
,
&
w
.
lock
);
vlc_mutex_init
(
&
w
.
lock
);
vlc_mutex_lock
(
&
w
.
lock
);
/* Install the callback */
...
...
modules/audio_output/portaudio.c
View file @
6da90a17
...
...
@@ -217,10 +217,10 @@ static int Open( vlc_object_t * p_this )
pa_thread
=
vlc_object_create
(
p_aout
,
sizeof
(
pa_thread_t
)
);
pa_thread
->
p_aout
=
p_aout
;
pa_thread
->
b_error
=
false
;
vlc_mutex_init
(
p_aout
,
&
pa_thread
->
lock_wait
);
vlc_mutex_init
(
&
pa_thread
->
lock_wait
);
vlc_cond_init
(
p_aout
,
&
pa_thread
->
wait
);
pa_thread
->
b_wait
=
false
;
vlc_mutex_init
(
p_aout
,
&
pa_thread
->
lock_signal
);
vlc_mutex_init
(
&
pa_thread
->
lock_signal
);
vlc_cond_init
(
p_aout
,
&
pa_thread
->
signal
);
pa_thread
->
b_signal
=
false
;
...
...
modules/codec/fake.c
View file @
6da90a17
...
...
@@ -326,7 +326,7 @@ static int OpenDecoder( vlc_object_t *p_this )
p_dec
->
pf_decode_video
=
DecodeBlock
;
p_dec
->
p_sys
->
p_image
=
p_image
;
vlc_mutex_init
(
p_dec
,
&
p_dec
->
p_sys
->
lock
);
vlc_mutex_init
(
&
p_dec
->
p_sys
->
lock
);
return
VLC_SUCCESS
;
}
...
...
modules/codec/ffmpeg/encoder.c
View file @
6da90a17
...
...
@@ -790,7 +790,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
pp_contexts
[
i
]
=
vlc_object_create
(
p_enc
,
sizeof
(
struct
thread_context_t
)
);
pp_contexts
[
i
]
->
p_context
=
p_sys
->
p_context
;
vlc_mutex_init
(
p_enc
,
&
pp_contexts
[
i
]
->
lock
);
vlc_mutex_init
(
&
pp_contexts
[
i
]
->
lock
);
vlc_cond_init
(
p_enc
,
&
pp_contexts
[
i
]
->
cond
);
pp_contexts
[
i
]
->
b_work
=
0
;
pp_contexts
[
i
]
->
b_done
=
0
;
...
...
modules/control/rc.c
View file @
6da90a17
...
...
@@ -319,7 +319,7 @@ static int Activate( vlc_object_t *p_this )
p_intf
->
p_sys
->
pi_socket_listen
=
pi_socket
;
p_intf
->
p_sys
->
i_socket
=
-
1
;
p_intf
->
p_sys
->
psz_unix_path
=
psz_unix_path
;
vlc_mutex_init
(
p_intf
,
&
p_intf
->
p_sys
->
status_lock
);
vlc_mutex_init
(
&
p_intf
->
p_sys
->
status_lock
);
p_intf
->
p_sys
->
i_last_state
=
PLAYLIST_STOPPED
;
/* Non-buffered stdout */
...
...
modules/demux/mkv.cpp
View file @
6da90a17
...
...
@@ -1326,7 +1326,7 @@ public:
,
b_pci_packet_set
(
false
)
,
p_ev
(
NULL
)
{
vlc_mutex_init
(
&
demuxer
,
&
lock_demuxer
);
vlc_mutex_init
(
&
lock_demuxer
);
}
virtual
~
demux_sys_t
()
...
...
@@ -2719,7 +2719,7 @@ void demux_sys_t::StartUiThread()
p_ev
=
(
event_thread_t
*
)
vlc_object_create
(
&
demuxer
,
sizeof
(
event_thread_t
)
);
p_ev
->
p_demux
=
&
demuxer
;
p_ev
->
b_die
=
false
;
vlc_mutex_init
(
p_ev
,
&
p_ev
->
lock
);
vlc_mutex_init
(
&
p_ev
->
lock
);
vlc_thread_create
(
p_ev
,
"mkv event thread handler"
,
EventThread
,
VLC_THREAD_PRIORITY_LOW
,
false
);
}
...
...
modules/gui/qt4/components/interface_widgets.cpp
View file @
6da90a17
...
...
@@ -59,7 +59,7 @@ static int DoControl( intf_thread_t *, void *, int, va_list );
VideoWidget
::
VideoWidget
(
intf_thread_t
*
_p_i
)
:
QFrame
(
NULL
),
p_intf
(
_p_i
)
{
/* Init */
vlc_mutex_init
(
p_intf
,
&
lock
);
vlc_mutex_init
(
&
lock
);
p_vout
=
NULL
;
hide
();
setMinimumSize
(
16
,
16
);
videoSize
.
rwidth
()
=
-
1
;
...
...
modules/gui/skins2/commands/async_queue.cpp
View file @
6da90a17
...
...
@@ -31,7 +31,7 @@ AsyncQueue::AsyncQueue( intf_thread_t *pIntf ): SkinObject( pIntf ),
m_cmdFlush
(
this
)
{
// Initialize the mutex
vlc_mutex_init
(
pIntf
,
&
m_lock
);
vlc_mutex_init
(
&
m_lock
);
// Create a timer
OSFactory
*
pOsFactory
=
OSFactory
::
instance
(
pIntf
);
...
...
modules/gui/wince/video.cpp
View file @
6da90a17
...
...
@@ -96,7 +96,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, HWND _p_parent )
p_parent
=
_p_parent
;
p_child_window
=
NULL
;
vlc_mutex_init
(
p_intf
,
&
lock
);
vlc_mutex_init
(
&
lock
);
p_vout
=
NULL
;
...
...
modules/gui/wxwidgets/video.cpp
View file @
6da90a17
...
...
@@ -97,7 +97,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ):
p_parent
=
_p_parent
;
p_child_window
=
0
;
vlc_mutex_init
(
p_intf
,
&
lock
);
vlc_mutex_init
(
&
lock
);
b_auto_size
=
p_intf
->
p_sys
->
b_video_autosize
;
...
...
modules/misc/audioscrobbler.c
View file @
6da90a17
...
...
@@ -180,7 +180,7 @@ static int Open( vlc_object_t *p_this )
p_intf
->
p_sys
=
p_sys
;
vlc_mutex_init
(
p_this
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
p_playlist
=
pl_Yield
(
p_intf
);
PL_LOCK
;
...
...
modules/misc/freetype.c
View file @
6da90a17
...
...
@@ -363,7 +363,7 @@ static int Create( vlc_object_t *p_this )
}
#ifdef HAVE_FONTCONFIG
vlc_mutex_init
(
p_filter
,
&
p_sys
->
fontconfig_lock
);
vlc_mutex_init
(
&
p_sys
->
fontconfig_lock
);
p_sys
->
b_fontconfig_ok
=
false
;
p_sys
->
p_fontconfig
=
NULL
;
...
...
modules/misc/gnutls.c
View file @
6da90a17
...
...
@@ -119,7 +119,7 @@ static int gcry_vlc_mutex_init( void **p_sys )
if
(
p_lock
==
NULL
)
return
ENOMEM
;
i_val
=
vlc_mutex_init
(
(
vlc_object_t
*
)
NULL
,
p_lock
);
i_val
=
vlc_mutex_init
(
p_lock
);
if
(
i_val
)
free
(
p_lock
);
else
...
...
@@ -1123,7 +1123,7 @@ static int OpenServer (vlc_object_t *obj)
/* No certificate validation by default */
p_sys
->
pf_handshake
=
gnutls_ContinueHandshake
;
vlc_mutex_init
(
p_server
,
&
p_sys
->
cache_lock
);
vlc_mutex_init
(
&
p_sys
->
cache_lock
);
/* Sets server's credentials */
val
=
gnutls_certificate_allocate_credentials
(
&
p_sys
->
x509_cred
);
...
...
modules/misc/notify/notify.c
View file @
6da90a17
...
...
@@ -97,7 +97,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
}
vlc_mutex_init
(
p_this
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
p_intf
->
p_sys
=
p_sys
;
...
...
modules/misc/rtsp.c
View file @
6da90a17
...
...
@@ -287,7 +287,7 @@ static int Open( vlc_object_t *p_this )
vlc_UrlClean
(
&
url
);
vlc_mutex_init
(
p_vod
,
&
p_sys
->
lock_media
);
vlc_mutex_init
(
&
p_sys
->
lock_media
);
TAB_INIT
(
p_sys
->
i_media
,
p_sys
->
media
);
p_sys
->
i_media_id
=
0
;
...
...
@@ -421,7 +421,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
TAB_APPEND
(
p_sys
->
i_media
,
p_sys
->
media
,
p_media
);
vlc_mutex_unlock
(
&
p_sys
->
lock_media
);
vlc_mutex_init
(
p_vod
,
&
p_media
->
lock
);
vlc_mutex_init
(
&
p_media
->
lock
);
p_media
->
psz_session_name
=
strdup
(
""
);
p_media
->
psz_session_description
=
strdup
(
""
);
p_media
->
psz_session_url
=
strdup
(
""
);
...
...
modules/services_discovery/upnp_intel.cpp
View file @
6da90a17
...
...
@@ -86,7 +86,7 @@ public:
Lockable
(
Cookie
*
c
)
{
vlc_mutex_init
(
c
->
serviceDiscovery
,
&
_mutex
);
vlc_mutex_init
(
&
_mutex
);
}
~
Lockable
()
...
...
modules/stream_out/rtp.c
View file @
6da90a17
...
...
@@ -438,8 +438,8 @@ static int Open( vlc_object_t *p_this )
p_stream
->
p_sys
=
p_sys
;
vlc_mutex_init
(
p_stream
,
&
p_sys
->
lock_sdp
);
vlc_mutex_init
(
p_stream
,
&
p_sys
->
lock_es
);
vlc_mutex_init
(
&
p_sys
->
lock_sdp
);
vlc_mutex_init
(
&
p_sys
->
lock_es
);
psz
=
var_GetNonEmptyString
(
p_stream
,
SOUT_CFG_PREFIX
"mux"
);
if
(
psz
!=
NULL
)
...
...
@@ -891,7 +891,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
msg_Dbg
(
p_stream
,
"maximum RTP packet size: %d bytes"
,
id
->
i_mtu
);
vlc_mutex_init
(
p_stream
,
&
id
->
lock_sink
);
vlc_mutex_init
(
&
id
->
lock_sink
);
id
->
sinkc
=
0
;
id
->
sinkv
=
NULL
;
id
->
rtsp_id
=
NULL
;
...
...
modules/stream_out/rtsp.c
View file @
6da90a17
...
...
@@ -84,7 +84,7 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
rtsp
->
host
=
NULL
;
rtsp
->
url
=
NULL
;
rtsp
->
psz_path
=
NULL
;
vlc_mutex_init
(
p_stream
,
&
rtsp
->
lock
);
vlc_mutex_init
(
&
rtsp
->
lock
);
rtsp
->
port
=
(
url
->
i_port
>
0
)
?
url
->
i_port
:
554
;
rtsp
->
psz_path
=
strdup
(
(
url
->
psz_path
!=
NULL
)
?
url
->
psz_path
:
"/"
);
...
...
modules/stream_out/transcode.c
View file @
6da90a17
...
...
@@ -1807,7 +1807,7 @@ static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
int
i_priority
=
p_sys
->
b_high_priority
?
VLC_THREAD_PRIORITY_OUTPUT
:
VLC_THREAD_PRIORITY_VIDEO
;
p_sys
->
id_video
=
id
;
vlc_mutex_init
(
p_stream
,
&
p_sys
->
lock_out
);
vlc_mutex_init
(
&
p_sys
->
lock_out
);
vlc_cond_init
(
p_stream
,
&
p_sys
->
cond
);
memset
(
p_sys
->
pp_pics
,
0
,
sizeof
(
p_sys
->
pp_pics
)
);
p_sys
->
i_first_pic
=
0
;
...
...
modules/video_filter/alphamask.c
View file @
6da90a17
...
...
@@ -110,7 +110,7 @@ static int Create( vlc_object_t *p_this )
config_ChainParse
(
p_filter
,
CFG_PREFIX
,
ppsz_filter_options
,
p_filter
->
p_cfg
);
vlc_mutex_init
(
p_filter
,
&
p_sys
->
mask_lock
);
vlc_mutex_init
(
&
p_sys
->
mask_lock
);
psz_string
=
var_CreateGetStringCommand
(
p_filter
,
CFG_PREFIX
"mask"
);
var_AddCallback
(
p_filter
,
CFG_PREFIX
"mask"
,
MaskCallback
,
...
...
modules/video_filter/atmo/AtmoDynData.cpp
View file @
6da90a17
...
...
@@ -17,7 +17,7 @@ CAtmoDynData::CAtmoDynData(vlc_object_t *p_atmo_filter, CAtmoConfig *pAtmoConfig
this
->
m_pAtmoConnection
=
NULL
;
this
->
m_pCurrentEffectThread
=
NULL
;
vlc_mutex_init
(
p_atmo_filter
,
&
m_lock
);
vlc_mutex_init
(
&
m_lock
);
}
#else
...
...
modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
View file @
6da90a17
...
...
@@ -19,7 +19,7 @@ CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData)
{
m_pCurrentFramePixels
=
NULL
;
vlc_cond_init
(
this
->
m_pAtmoThread
,
&
m_WakeupCond
);
vlc_mutex_init
(
m_pAtmoThread
,
&
m_WakeupLock
);
vlc_mutex_init
(
&
m_WakeupLock
);
msg_Dbg
(
m_pAtmoThread
,
"CAtmoExternalCaptureInput created."
);
}
...
...
modules/video_filter/atmo/AtmoThread.cpp
View file @
6da90a17
...
...
@@ -21,7 +21,7 @@ CThread::CThread(vlc_object_t *pOwner)
vlc_object_attach
(
m_pAtmoThread
,
m_pOwner
);
vlc_mutex_init
(
m_pAtmoThread
,
&
m_TerminateLock
);
vlc_mutex_init
(
&
m_TerminateLock
);
err
=
vlc_cond_init
(
m_pAtmoThread
,
&
m_TerminateCond
);
if
(
err
)
{
msg_Err
(
m_pAtmoThread
,
"vlc_cond_init failed %d"
,
err
);
...
...
modules/video_filter/atmo/atmo.cpp
View file @
6da90a17
...
...
@@ -991,7 +991,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
p_sys
->
i_atmo_height
=
48
;
vlc_mutex_init
(
p_filter
,
&
p_sys
->
filter_lock
);
vlc_mutex_init
(
&
p_sys
->
filter_lock
);
#if defined(WIN32)
...
...
modules/video_filter/deinterlace.c
View file @
6da90a17
...
...
@@ -206,7 +206,7 @@ static int Create( vlc_object_t *p_this )
p_vout
->
p_sys
->
b_double_rate
=
false
;
p_vout
->
p_sys
->
last_date
=
0
;
p_vout
->
p_sys
->
p_vout
=
0
;
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
filter_lock
);
vlc_mutex_init
(
&
p_vout
->
p_sys
->
filter_lock
);
#if defined(CAN_COMPILE_C_ALTIVEC)
if
(
vlc_CPU
()
&
CPU_CAPABILITY_ALTIVEC
)
...
...
modules/video_filter/erase.c
View file @
6da90a17
...
...
@@ -174,7 +174,7 @@ static int Create( vlc_object_t *p_this )
var_AddCallback
(
p_filter
,
CFG_PREFIX
"y"
,
EraseCallback
,
p_sys
);
var_AddCallback
(
p_filter
,
CFG_PREFIX
"mask"
,
EraseCallback
,
p_sys
);
vlc_mutex_init
(
p_filter
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
return
VLC_SUCCESS
;
}
...
...
modules/video_filter/logo.c
View file @
6da90a17
...
...
@@ -753,7 +753,7 @@ static int CreateFilter( vlc_object_t *p_this )
var_AddCallback
(
p_filter
,
"logo-transparency"
,
LogoCallback
,
p_sys
);
var_AddCallback
(
p_filter
,
"logo-repeat"
,
LogoCallback
,
p_sys
);
vlc_mutex_init
(
p_filter
,
&
p_logo_list
->
lock
);
vlc_mutex_init
(
&
p_logo_list
->
lock
);
vlc_mutex_lock
(
&
p_logo_list
->
lock
);
LoadLogoList
(
p_this
,
p_logo_list
);
...
...
modules/video_filter/mosaic.c
View file @
6da90a17
...
...
@@ -301,7 +301,7 @@ static int CreateFilter( vlc_object_t *p_this )
p_filter
->
pf_sub_filter
=
Filter
;
vlc_mutex_init
(
p_filter
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
vlc_mutex_lock
(
&
p_sys
->
lock
);
var_Create
(
p_libvlc
,
"mosaic-lock"
,
VLC_VAR_MUTEX
);
...
...
modules/video_filter/motiondetect.c
View file @
6da90a17
...
...
@@ -101,7 +101,7 @@ static int Create( vlc_object_t *p_this )
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
#endif
vlc_mutex_init
(
p_filter
,
&
p_filter
->
p_sys
->
lock
);
vlc_mutex_init
(
&
p_filter
->
p_sys
->
lock
);
return
VLC_SUCCESS
;
}
...
...
modules/video_filter/rss.c
View file @
6da90a17
...
...
@@ -243,7 +243,7 @@ static int CreateFilter( vlc_object_t *p_this )
return
VLC_ENOMEM
;
}
vlc_mutex_init
(
p_filter
,
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
vlc_mutex_lock
(
&
p_sys
->
lock
);
config_ChainParse
(
p_filter
,
CFG_PREFIX
,
ppsz_filter_options
,
...
...
modules/video_output/msw/direct3d.c
View file @
6da90a17
...
...
@@ -174,7 +174,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout
->
p_sys
->
hwnd
=
p_vout
->
p_sys
->
hvideownd
=
NULL
;
p_vout
->
p_sys
->
hparent
=
p_vout
->
p_sys
->
hfswnd
=
NULL
;
p_vout
->
p_sys
->
i_changes
=
0
;
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
lock
);
vlc_mutex_init
(
&
p_vout
->
p_sys
->
lock
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_display
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_parent
);
...
...
modules/video_output/msw/directx.c
View file @
6da90a17
...
...
@@ -230,7 +230,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout
->
p_sys
->
hparent
=
p_vout
->
p_sys
->
hfswnd
=
NULL
;
p_vout
->
p_sys
->
i_changes
=
0
;
p_vout
->
p_sys
->
b_wallpaper
=
0
;
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
lock
);
vlc_mutex_init
(
&
p_vout
->
p_sys
->
lock
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_display
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_parent
);
...
...
modules/video_output/msw/glwin32.c
View file @
6da90a17
...
...
@@ -110,7 +110,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout
->
p_sys
->
hwnd
=
p_vout
->
p_sys
->
hvideownd
=
NULL
;
p_vout
->
p_sys
->
hparent
=
p_vout
->
p_sys
->
hfswnd
=
NULL
;
p_vout
->
p_sys
->
i_changes
=
0
;
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
lock
);
vlc_mutex_init
(
&
p_vout
->
p_sys
->
lock
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_display
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_parent
);
...
...
modules/video_output/msw/wingdi.c
View file @
6da90a17
...
...
@@ -222,7 +222,7 @@ static int OpenVideo ( vlc_object_t *p_this )
p_vout
->
p_sys
->
hwnd
=
p_vout
->
p_sys
->
hvideownd
=
NULL
;
p_vout
->
p_sys
->
hparent
=
p_vout
->
p_sys
->
hfswnd
=
NULL
;
p_vout
->
p_sys
->
i_changes
=
0
;
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
lock
);
vlc_mutex_init
(
&
p_vout
->
p_sys
->
lock
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_display
);
SetRectEmpty
(
&
p_vout
->
p_sys
->
rect_parent
);
...
...
modules/video_output/x11/xcommon.c
View file @
6da90a17
...
...
@@ -211,7 +211,7 @@ int E_(Activate) ( vlc_object_t *p_this )
return
VLC_ENOMEM
;
}
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
lock
);
vlc_mutex_init
(
&
p_vout
->
p_sys
->
lock
);
/* Open display, using the "display" config variable or the DISPLAY
* environment variable */
...
...
modules/visualization/goom.c
View file @
6da90a17
...
...
@@ -181,7 +181,7 @@ static int Open( vlc_object_t *p_this )
free
(
p_sys
);
return
VLC_EGENERIC
;
}
vlc_mutex_init
(
p_filter
,
&
p_thread
->
lock
);
vlc_mutex_init
(
&
p_thread
->
lock
);
vlc_cond_init
(
p_filter
,
&
p_thread
->
wait
);
p_thread
->
i_blocks
=
0
;
...
...
src/audio_output/common.c
View file @
6da90a17
...
...
@@ -52,9 +52,9 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
}
/* Initialize members. */
vlc_mutex_init
(
p_parent
,
&
p_aout
->
input_fifos_lock
);
vlc_mutex_init
(
p_parent
,
&
p_aout
->
mixer_lock
);
vlc_mutex_init
(
p_parent
,
&
p_aout
->
output_fifo_lock
);
vlc_mutex_init
(
&
p_aout
->
input_fifos_lock
);
vlc_mutex_init
(
&
p_aout
->
mixer_lock
);
vlc_mutex_init
(
&
p_aout
->
output_fifo_lock
);
p_aout
->
i_nb_inputs
=
0
;
p_aout
->
mixer
.
f_multiplier
=
1
.
0
;
p_aout
->
mixer
.
b_error
=
1
;
...
...
src/audio_output/dec.c
View file @
6da90a17
...
...
@@ -85,7 +85,7 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
}
memset
(
p_input
,
0
,
sizeof
(
aout_input_t
)
);
vlc_mutex_init
(
p_aout
,
&
p_input
->
lock
);
vlc_mutex_init
(
&
p_input
->
lock
);
p_input
->
b_changed
=
0
;
p_input
->
b_error
=
1
;
...
...
src/control/core.c
View file @
6da90a17
...
...
@@ -129,8 +129,8 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
p_new
->
b_playlist_locked
=
0
;
p_new
->
ref_count
=
1
;
p_new
->
p_callback_list
=
NULL
;
vlc_mutex_init
(
p_libvlc_int
,
&
p_new
->
instance_lock
);
vlc_mutex_init
(
p_libvlc_int
,
&
p_new
->
event_callback_lock
);
vlc_mutex_init
(
&
p_new
->
instance_lock
);
vlc_mutex_init
(
&
p_new
->
event_callback_lock
);
libvlc_event_init
(
p_new
,
p_e
);
...
...
src/control/event.c
View file @
6da90a17
...
...
@@ -100,7 +100,7 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst,
p_em
->
p_libvlc_instance
=
p_libvlc_inst
;
libvlc_retain
(
p_libvlc_inst
);
vlc_array_init
(
&
p_em
->
listeners_groups
);
vlc_mutex_init
(
p_libvlc_inst
->
p_libvlc_int
,
&
p_em
->
object_lock
);
vlc_mutex_init
(
&
p_em
->
object_lock
);
vlc_mutex_init_recursive
(
p_libvlc_inst
->
p_libvlc_int
,
&
p_em
->
event_sending_lock
);
return
p_em
;
}
...
...
src/control/media_list.c
View file @
6da90a17
...
...
@@ -152,7 +152,7 @@ libvlc_media_list_new( libvlc_instance_t * p_inst,
return
NULL
;
}
vlc_mutex_init
(
p_inst
->
p_libvlc_int
,
&
p_mlist
->
object_lock
);
vlc_mutex_init
(
&
p_mlist
->
object_lock
);
vlc_array_init
(
&
p_mlist
->
items
);
p_mlist
->
i_refcount
=
1
;
...
...
src/control/media_list_player.c
View file @
6da90a17
...
...
@@ -259,7 +259,7 @@ libvlc_media_list_player_new( libvlc_instance_t * p_instance,
p_mlp
->
current_playing_item_path
=
NULL
;
p_mlp
->
p_mi
=
NULL
;
p_mlp
->
p_mlist
=
NULL
;
vlc_mutex_init
(
p_instance
->
p_libvlc_int
,
&
p_mlp
->
object_lock
);
vlc_mutex_init
(
&
p_mlp
->
object_lock
);
p_mlp
->
p_event_manager
=
libvlc_event_manager_new
(
p_mlp
,
p_instance
,
p_e
);
...
...
src/control/media_list_view.c
View file @
6da90a17
...
...
@@ -328,7 +328,7 @@ libvlc_media_list_view_new( libvlc_media_list_t * p_mlist,
p_mlv
->
p_this_view_data
=
this_view_data
;
vlc_mutex_init
(
p_mlv
->
p_libvlc_instance
->
p_libvlc_int
,
&
p_mlv
->
object_lock
);
vlc_mutex_init
(
&
p_mlv
->
object_lock
);
p_mlv
->
i_refcount
=
1
;
return
p_mlv
;
...
...
src/control/media_player.c
View file @
6da90a17
...
...
@@ -305,8 +305,7 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
* - No lock held in constructor
* - Lock when accessing all variable this lock is held
* - Lock when attempting to destroy the object the lock is also held */
vlc_mutex_init
(
p_mi
->
p_libvlc_instance
->
p_libvlc_int
,
&
p_mi
->
object_lock
);
vlc_mutex_init
(
&
p_mi
->
object_lock
);
p_mi
->
p_event_manager
=
libvlc_event_manager_new
(
p_mi
,
p_libvlc_instance
,
p_e
);
if
(
libvlc_exception_raised
(
p_e
)
)
...
...
src/input/decoder.c
View file @
6da90a17
...
...
@@ -563,7 +563,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
p_owner
->
b_cc_supported
=
true
;
}
vlc_mutex_init
(
p_dec
,
&
p_owner
->
lock_cc
);
vlc_mutex_init
(
&
p_owner
->
lock_cc
);
for
(
i
=
0
;
i
<
4
;
i
++
)
{
p_owner
->
pb_cc_present
[
i
]
=
false
;
...
...
src/input/input.c
View file @
6da90a17
...
...
@@ -217,7 +217,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
p_input
->
p
->
slave
=
NULL
;
/* Init control buffer */
vlc_mutex_init
(
p_input
,
&
p_input
->
p
->
lock_control
);