Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
9147fefb
Commit
9147fefb
authored
Feb 11, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Move wg_parser_destroy() to the Unix library.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
10dde32d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
17 deletions
+19
-17
gst_private.h
dlls/winegstreamer/gst_private.h
+1
-0
gstdemux.c
dlls/winegstreamer/gstdemux.c
+1
-17
wg_parser.c
dlls/winegstreamer/wg_parser.c
+17
-0
No files found.
dlls/winegstreamer/gst_private.h
View file @
9147fefb
...
...
@@ -210,6 +210,7 @@ struct unix_funcs
struct
wg_parser
*
(
CDECL
*
wg_avi_parser_create
)(
void
);
struct
wg_parser
*
(
CDECL
*
wg_mpeg_audio_parser_create
)(
void
);
struct
wg_parser
*
(
CDECL
*
wg_wave_parser_create
)(
void
);
void
(
CDECL
*
wg_parser_destroy
)(
struct
wg_parser
*
parser
);
};
extern
const
struct
unix_funcs
*
unix_funcs
;
...
...
dlls/winegstreamer/gstdemux.c
View file @
9147fefb
...
...
@@ -1225,22 +1225,6 @@ static struct strmbase_pin *parser_get_pin(struct strmbase_filter *base, unsigne
return
NULL
;
}
static
void
wg_parser_destroy
(
struct
wg_parser
*
parser
)
{
if
(
parser
->
bus
)
{
gst_bus_set_sync_handler
(
parser
->
bus
,
NULL
,
NULL
,
NULL
);
gst_object_unref
(
parser
->
bus
);
}
pthread_mutex_destroy
(
&
parser
->
mutex
);
pthread_cond_destroy
(
&
parser
->
init_cond
);
pthread_cond_destroy
(
&
parser
->
read_cond
);
pthread_cond_destroy
(
&
parser
->
read_done_cond
);
free
(
parser
);
}
static
void
parser_destroy
(
struct
strmbase_filter
*
iface
)
{
struct
parser
*
filter
=
impl_from_strmbase_filter
(
iface
);
...
...
@@ -1259,7 +1243,7 @@ static void parser_destroy(struct strmbase_filter *iface)
IAsyncReader_Release
(
filter
->
reader
);
filter
->
reader
=
NULL
;
wg_parser_destroy
(
filter
->
wg_parser
);
unix_funcs
->
wg_parser_destroy
(
filter
->
wg_parser
);
strmbase_sink_cleanup
(
&
filter
->
sink
);
strmbase_filter_cleanup
(
&
filter
->
filter
);
...
...
dlls/winegstreamer/wg_parser.c
View file @
9147fefb
...
...
@@ -1011,12 +1011,29 @@ static struct wg_parser * CDECL wg_wave_parser_create(void)
return
parser
;
}
static
void
CDECL
wg_parser_destroy
(
struct
wg_parser
*
parser
)
{
if
(
parser
->
bus
)
{
gst_bus_set_sync_handler
(
parser
->
bus
,
NULL
,
NULL
,
NULL
);
gst_object_unref
(
parser
->
bus
);
}
pthread_mutex_destroy
(
&
parser
->
mutex
);
pthread_cond_destroy
(
&
parser
->
init_cond
);
pthread_cond_destroy
(
&
parser
->
read_cond
);
pthread_cond_destroy
(
&
parser
->
read_done_cond
);
free
(
parser
);
}
static
const
struct
unix_funcs
funcs
=
{
wg_decodebin_parser_create
,
wg_avi_parser_create
,
wg_mpeg_audio_parser_create
,
wg_wave_parser_create
,
wg_parser_destroy
,
};
NTSTATUS
CDECL
__wine_init_unix_lib
(
HMODULE
module
,
DWORD
reason
,
const
void
*
ptr_in
,
void
*
ptr_out
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment