Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
254ac4c3
Commit
254ac4c3
authored
May 26, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auhal: remove some unused variables
parent
587d8cd4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
15 deletions
+0
-15
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+0
-15
No files found.
modules/audio_output/auhal.c
View file @
254ac4c3
...
@@ -77,18 +77,15 @@
...
@@ -77,18 +77,15 @@
*****************************************************************************/
*****************************************************************************/
struct
aout_sys_t
struct
aout_sys_t
{
{
AudioObjectID
i_default_dev
;
/* DeviceID of defaultOutputDevice */
AudioObjectID
i_selected_dev
;
/* DeviceID of the selected device */
AudioObjectID
i_selected_dev
;
/* DeviceID of the selected device */
AudioObjectID
i_new_selected_dev
;
/* DeviceID of device which will be selected on start */
AudioObjectID
i_new_selected_dev
;
/* DeviceID of device which will be selected on start */
bool
b_selected_dev_is_digital
;
bool
b_selected_dev_is_digital
;
AudioDeviceIOProcID
i_procID
;
/* DeviceID of current device */
AudioDeviceIOProcID
i_procID
;
/* DeviceID of current device */
bool
b_digital
;
/* Are we running in digital mode? */
bool
b_digital
;
/* Are we running in digital mode? */
mtime_t
clock_diff
;
/* Difference between VLC clock and Device clock */
uint8_t
chans_to_reorder
;
/* do we need channel reordering */
uint8_t
chans_to_reorder
;
/* do we need channel reordering */
uint8_t
chan_table
[
AOUT_CHAN_MAX
];
uint8_t
chan_table
[
AOUT_CHAN_MAX
];
UInt32
i_numberOfChannels
;
TPCircularBuffer
circular_buffer
;
/* circular buffer to swap the audio data */
TPCircularBuffer
circular_buffer
;
/* circular buffer to swap the audio data */
/* AUHAL specific */
/* AUHAL specific */
...
@@ -279,7 +276,6 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
...
@@ -279,7 +276,6 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
p_sys
->
b_digital
=
false
;
p_sys
->
b_digital
=
false
;
p_sys
->
au_component
=
NULL
;
p_sys
->
au_component
=
NULL
;
p_sys
->
au_unit
=
NULL
;
p_sys
->
au_unit
=
NULL
;
p_sys
->
clock_diff
=
(
mtime_t
)
0
;
p_sys
->
i_hog_pid
=
-
1
;
p_sys
->
i_hog_pid
=
-
1
;
p_sys
->
i_stream_id
=
0
;
p_sys
->
i_stream_id
=
0
;
p_sys
->
i_stream_index
=
-
1
;
p_sys
->
i_stream_index
=
-
1
;
...
@@ -571,7 +567,6 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
...
@@ -571,7 +567,6 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
msg_Dbg
(
p_aout
,
"selected %d physical channels for device output"
,
aout_FormatNbChannels
(
fmt
));
msg_Dbg
(
p_aout
,
"selected %d physical channels for device output"
,
aout_FormatNbChannels
(
fmt
));
msg_Dbg
(
p_aout
,
"VLC will output: %s"
,
aout_FormatPrintChannels
(
fmt
));
msg_Dbg
(
p_aout
,
"VLC will output: %s"
,
aout_FormatPrintChannels
(
fmt
));
p_sys
->
i_numberOfChannels
=
aout_FormatNbChannels
(
fmt
);
memset
(
&
new_layout
,
0
,
sizeof
(
new_layout
));
memset
(
&
new_layout
,
0
,
sizeof
(
new_layout
));
uint32_t
chans_out
[
AOUT_CHAN_MAX
];
uint32_t
chans_out
[
AOUT_CHAN_MAX
];
...
@@ -791,11 +786,6 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
...
@@ -791,11 +786,6 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
/* AU initiliaze */
/* AU initiliaze */
verify_noerr
(
AudioUnitInitialize
(
p_sys
->
au_unit
));
verify_noerr
(
AudioUnitInitialize
(
p_sys
->
au_unit
));
/* Find the difference between device clock and mdate clock */
p_sys
->
clock_diff
=
-
(
mtime_t
)
AudioConvertHostTimeToNanos
(
AudioGetCurrentHostTime
())
/
1000
;
p_sys
->
clock_diff
+=
mdate
();
/* setup circular buffer */
/* setup circular buffer */
TPCircularBufferInit
(
&
p_sys
->
circular_buffer
,
AUDIO_BUFFER_SIZE_IN_SECONDS
*
TPCircularBufferInit
(
&
p_sys
->
circular_buffer
,
AUDIO_BUFFER_SIZE_IN_SECONDS
*
fmt
->
i_rate
*
fmt
->
i_bytes_per_frame
);
fmt
->
i_rate
*
fmt
->
i_bytes_per_frame
);
...
@@ -992,11 +982,6 @@ static int StartSPDIF(audio_output_t * p_aout, audio_sample_format_t *fmt)
...
@@ -992,11 +982,6 @@ static int StartSPDIF(audio_output_t * p_aout, audio_sample_format_t *fmt)
return
false
;
return
false
;
}
}
/* Check for the difference between the Device clock and mdate */
p_sys
->
clock_diff
=
-
(
mtime_t
)
AudioConvertHostTimeToNanos
(
AudioGetCurrentHostTime
())
/
1000
;
p_sys
->
clock_diff
+=
mdate
();
/* Start device */
/* Start device */
err
=
AudioDeviceStart
(
p_sys
->
i_selected_dev
,
p_sys
->
i_procID
);
err
=
AudioDeviceStart
(
p_sys
->
i_selected_dev
,
p_sys
->
i_procID
);
if
(
err
!=
noErr
)
{
if
(
err
!=
noErr
)
{
...
...
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