Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
fdaa7f76
Commit
fdaa7f76
authored
Oct 15, 2015
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tizen_audio: use new 2.4 functions dynamically
parent
c3112fcc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
16 deletions
+22
-16
modules/audio_output/tizen_audio.c
modules/audio_output/tizen_audio.c
+22
-16
No files found.
modules/audio_output/tizen_audio.c
View file @
fdaa7f76
...
@@ -35,10 +35,6 @@
...
@@ -35,10 +35,6 @@
#include "audio_io.h"
#include "audio_io.h"
#include "sound_manager.h"
#include "sound_manager.h"
#if TIZEN_SDK_MAJOR >= 3 || (TIZEN_SDK_MAJOR >= 2 && TIZEN_SDK_MINOR >= 4)
#define AUDIO_IO_HAS_FLUSH
#endif
static
int
Open
(
vlc_object_t
*
);
static
int
Open
(
vlc_object_t
*
);
static
void
Close
(
vlc_object_t
*
);
static
void
Close
(
vlc_object_t
*
);
...
@@ -53,6 +49,9 @@ struct aout_sys_t {
...
@@ -53,6 +49,9 @@ struct aout_sys_t {
unsigned
int
i_rate
;
unsigned
int
i_rate
;
audio_sample_type_e
i_sample_type
;
audio_sample_type_e
i_sample_type
;
audio_channel_e
i_channel
;
audio_channel_e
i_channel
;
int
(
*
pf_audio_out_drain
)(
audio_out_h
output
);
int
(
*
pf_audio_out_flush
)(
audio_out_h
output
);
};
};
/* Soft volume helper */
/* Soft volume helper */
...
@@ -276,19 +275,22 @@ Flush( audio_output_t *p_aout, bool b_wait )
...
@@ -276,19 +275,22 @@ Flush( audio_output_t *p_aout, bool b_wait )
if
(
!
p_sys
->
out
)
if
(
!
p_sys
->
out
)
return
;
return
;
#ifdef AUDIO_IO_HAS_FLUSH
if
(
p_sys
->
pf_audio_out_drain
||
p_sys
->
pf_audio_out_flush
)
{
if
(
b_wait
)
if
(
b_wait
)
VLCRET
(
audio_out_drain
(
p_aout
)
);
VLCRET
(
p_sys
->
pf_audio_out_drain
(
p_sys
->
out
)
);
else
VLCRET
(
p_sys
->
pf_audio_out_flush
(
p_sys
->
out
)
);
}
else
else
VLCRET
(
audio_out_flush
(
p_aout
)
);
{
#else
(
void
)
b_wait
;
(
void
)
b_wait
;
if
(
AudioIO_Unprepare
(
p_aout
)
)
if
(
AudioIO_Unprepare
(
p_aout
)
)
return
;
return
;
audio_out_destroy
(
p_sys
->
out
);
audio_out_destroy
(
p_sys
->
out
);
p_sys
->
out
=
NULL
;
p_sys
->
out
=
NULL
;
AudioIO_Start
(
p_aout
);
AudioIO_Start
(
p_aout
);
#endif
}
}
}
static
int
static
int
...
@@ -309,6 +311,10 @@ Open( vlc_object_t *obj )
...
@@ -309,6 +311,10 @@ Open( vlc_object_t *obj )
p_aout
->
flush
=
Flush
;
p_aout
->
flush
=
Flush
;
/* p_aout->time_get = TimeGet; FIXME */
/* p_aout->time_get = TimeGet; FIXME */
/* Available only on 2.4 */
p_sys
->
pf_audio_out_drain
=
dlsym
(
RTLD_DEFAULT
,
"audio_out_drain"
);
p_sys
->
pf_audio_out_flush
=
dlsym
(
RTLD_DEFAULT
,
"audio_out_flush"
);
aout_SoftVolumeInit
(
p_aout
);
aout_SoftVolumeInit
(
p_aout
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
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