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
f7cee4f2
Commit
f7cee4f2
authored
May 01, 2002
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Misc sound fixes [Mac OS X port]
* Fixed VCD double detection
parent
f59cd97b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
configure
configure
+1
-1
configure.in
configure.in
+1
-1
plugins/macosx/aout_macosx.c
plugins/macosx/aout_macosx.c
+7
-2
No files found.
configure
View file @
f7cee4f2
...
@@ -6098,7 +6098,7 @@ rm -f conftest*
...
@@ -6098,7 +6098,7 @@ rm -f conftest*
if
test
"x
${
SYS
}
"
=
"xdarwin"
if
test
"x
${
SYS
}
"
=
"xdarwin"
then
then
PLUGINS
=
"
${
PLUGINS
}
vcd"
# No need to add vcd to PLUGINS, Darwin is already based on FreeBSD
vcd_LDFLAGS
=
"
${
vcd_LDFLAGS
}
-framework IOKit -framework CoreFoundation"
vcd_LDFLAGS
=
"
${
vcd_LDFLAGS
}
-framework IOKit -framework CoreFoundation"
fi
fi
fi
fi
...
...
configure.in
View file @
f7cee4f2
...
@@ -735,7 +735,7 @@ then
...
@@ -735,7 +735,7 @@ then
if test "x${SYS}" = "xdarwin"
if test "x${SYS}" = "xdarwin"
then
then
PLUGINS="${PLUGINS} vcd"
# No need to add vcd to PLUGINS, Darwin is already based on FreeBSD
vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation"
vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation"
fi
fi
fi
fi
...
...
plugins/macosx/aout_macosx.c
View file @
f7cee4f2
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* aout_macosx.c : CoreAudio output plugin
* aout_macosx.c : CoreAudio output plugin
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: aout_macosx.c,v 1.1
8 2002/04/25 23:07:23
massiot Exp $
* $Id: aout_macosx.c,v 1.1
9 2002/05/01 22:32:27
massiot Exp $
*
*
* Authors: Colin Delacroix <colin@zoy.org>
* Authors: Colin Delacroix <colin@zoy.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* Jon Lech Johansen <jon-vl@nanocrew.net>
...
@@ -147,7 +147,6 @@ static int aout_Open( aout_thread_t *p_aout )
...
@@ -147,7 +147,6 @@ static int aout_Open( aout_thread_t *p_aout )
intf_ErrMsg
(
"aout error: failed to get device buffer size: %d"
,
err
);
intf_ErrMsg
(
"aout error: failed to get device buffer size: %d"
,
err
);
return
(
-
1
);
return
(
-
1
);
}
}
p_aout
->
i_latency
=
p_aout
->
p_sys
->
ui_buffer_size
;
/* get a description of the data format used by the device */
/* get a description of the data format used by the device */
ui_param_size
=
sizeof
(
p_aout
->
p_sys
->
s_dst_stream_format
);
ui_param_size
=
sizeof
(
p_aout
->
p_sys
->
s_dst_stream_format
);
...
@@ -348,6 +347,11 @@ static OSStatus CAIOCallback( AudioDeviceID inDevice,
...
@@ -348,6 +347,11 @@ static OSStatus CAIOCallback( AudioDeviceID inDevice,
p_sys
->
b_buffer_data
=
0
;
p_sys
->
b_buffer_data
=
0
;
}
}
else
{
memset
(
outOutputData
->
mBuffers
[
0
].
mData
,
0
,
p_sys
->
ui_buffer_size
);
intf_WarnMsg
(
1
,
"aout warning: audio output is starving, expect glitches"
);
}
vlc_mutex_unlock
(
&
p_sys
->
mutex_lock
);
vlc_mutex_unlock
(
&
p_sys
->
mutex_lock
);
...
@@ -425,6 +429,7 @@ static int CABeginFormat( aout_thread_t *p_aout )
...
@@ -425,6 +429,7 @@ static int CABeginFormat( aout_thread_t *p_aout )
kAudioDevicePropertyBufferSize
,
kAudioDevicePropertyBufferSize
,
ui_param_size
,
ui_param_size
,
&
p_aout
->
p_sys
->
ui_buffer_size
);
&
p_aout
->
p_sys
->
ui_buffer_size
);
p_aout
->
i_latency
=
p_aout
->
p_sys
->
ui_buffer_size
;
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