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
c1b7b82d
Commit
c1b7b82d
authored
Dec 31, 2001
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Fixed the aRts audio output plugin.
parent
0eed3e6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
plugins/arts/aout_arts.c
plugins/arts/aout_arts.c
+13
-4
plugins/arts/arts.c
plugins/arts/arts.c
+1
-0
No files found.
plugins/arts/aout_arts.c
View file @
c1b7b82d
...
@@ -96,12 +96,20 @@ static int aout_Open( aout_thread_t *p_aout )
...
@@ -96,12 +96,20 @@ static int aout_Open( aout_thread_t *p_aout )
p_aout
->
i_channels
=
1
+
main_GetIntVariable
(
AOUT_STEREO_VAR
,
AOUT_STEREO_DEFAULT
);
p_aout
->
i_channels
=
1
+
main_GetIntVariable
(
AOUT_STEREO_VAR
,
AOUT_STEREO_DEFAULT
);
p_aout
->
l_rate
=
AOUT_RATE_DEFAULT
;
p_aout
->
l_rate
=
AOUT_RATE_DEFAULT
;
/* Allocate structure */
p_aout
->
p_sys
=
malloc
(
sizeof
(
aout_sys_t
)
);
if
(
p_aout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
i_err
=
arts_init
();
i_err
=
arts_init
();
if
(
i_err
<
0
)
if
(
i_err
<
0
)
{
{
fprintf
(
stderr
,
"arts_init error: %s
\n
"
,
arts_error_text
(
i_err
));
intf_ErrMsg
(
"aout error: arts_init (%s)"
,
arts_error_text
(
i_err
)
);
free
(
p_aout
->
p_sys
);
return
(
-
1
);
return
(
-
1
);
}
}
...
@@ -120,7 +128,7 @@ static int aout_SetFormat( aout_thread_t *p_aout )
...
@@ -120,7 +128,7 @@ static int aout_SetFormat( aout_thread_t *p_aout )
/* p_aout->i_latency = esd_get_latency(i_fd);*/
/* p_aout->i_latency = esd_get_latency(i_fd);*/
p_aout
->
i_latency
=
0
;
p_aout
->
i_latency
=
0
;
intf_WarnMsg
(
2
,
"aout_arts_latency: %d"
,
p_aout
->
i_latency
);
//intf_WarnMsg( 5
, "aout_arts_latency: %d",p_aout->i_latency);
return
(
0
);
return
(
0
);
}
}
...
@@ -144,9 +152,9 @@ static void aout_Play( aout_thread_t *p_aout, byte_t *buffer, int i_size )
...
@@ -144,9 +152,9 @@ static void aout_Play( aout_thread_t *p_aout, byte_t *buffer, int i_size )
int
i_err
=
arts_write
(
p_aout
->
p_sys
->
stream
,
buffer
,
i_size
);
int
i_err
=
arts_write
(
p_aout
->
p_sys
->
stream
,
buffer
,
i_size
);
if
(
i_err
<
0
)
if
(
i_err
<
0
)
{
{
fprintf
(
stderr
,
"arts_write error: %s
\n
"
,
arts_error_text
(
i_err
)
);
intf_ErrMsg
(
"aout error: arts_write (%s)"
,
arts_error_text
(
i_err
)
);
}
}
}
}
...
@@ -157,5 +165,6 @@ static void aout_Play( aout_thread_t *p_aout, byte_t *buffer, int i_size )
...
@@ -157,5 +165,6 @@ static void aout_Play( aout_thread_t *p_aout, byte_t *buffer, int i_size )
static
void
aout_Close
(
aout_thread_t
*
p_aout
)
static
void
aout_Close
(
aout_thread_t
*
p_aout
)
{
{
arts_close_stream
(
p_aout
->
p_sys
->
stream
);
arts_close_stream
(
p_aout
->
p_sys
->
stream
);
free
(
p_aout
->
p_sys
);
}
}
plugins/arts/arts.c
View file @
c1b7b82d
...
@@ -45,6 +45,7 @@ MODULE_CONFIG_STOP
...
@@ -45,6 +45,7 @@ MODULE_CONFIG_STOP
MODULE_INIT_START
MODULE_INIT_START
SET_DESCRIPTION
(
"aRts audio module"
)
SET_DESCRIPTION
(
"aRts audio module"
)
ADD_CAPABILITY
(
AOUT
,
50
)
ADD_CAPABILITY
(
AOUT
,
50
)
ADD_SHORTCUT
(
"arts"
)
MODULE_INIT_STOP
MODULE_INIT_STOP
MODULE_ACTIVATE_START
MODULE_ACTIVATE_START
...
...
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