Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
dd524996
Commit
dd524996
authored
Oct 30, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove aRts plugin (again)
parent
55bdfd25
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
202 deletions
+0
-202
configure.ac
configure.ac
+0
-17
modules/audio_output/Modules.am
modules/audio_output/Modules.am
+0
-1
modules/audio_output/arts.c
modules/audio_output/arts.c
+0
-184
No files found.
configure.ac
View file @
dd524996
...
...
@@ -4599,23 +4599,6 @@ AC_ARG_ENABLE(portaudio,
fi
fi])
dnl
dnl aRts module
dnl broken? (froze wxWidgets back then)
dnl
AC_ARG_ENABLE(arts,
[ --enable-arts aRts sound server (default disabled)],
[if test "${enable_arts}" = "yes"
then
AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
if test "${ARTS_CONFIG}" != "no"
then
VLC_ADD_PLUGIN([arts])
VLC_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`])
VLC_ADD_LIBS([arts],[`${ARTS_CONFIG} --libs `])
fi
fi])
dnl
dnl ALSA module
dnl
...
...
modules/audio_output/Modules.am
View file @
dd524996
SOURCES_alsa = alsa.c
SOURCES_arts = arts.c
SOURCES_aout_directx = directx.c
SOURCES_esd = esd.c
SOURCES_aout_file = file.c
...
...
modules/audio_output/arts.c
deleted
100644 → 0
View file @
55bdfd25
/*****************************************************************************
* arts.c : aRts module
*****************************************************************************
* Copyright (C) 2001-2002 the VideoLAN team
* $Id$
*
* Authors: Emmanuel Blindauer <manu@agat.net>
* Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <unistd.h>
/* write(), close() */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <artsc.h>
/*****************************************************************************
* aout_sys_t: arts audio output method descriptor
*****************************************************************************
* This structure is part of the audio output thread descriptor.
* It describes some arts specific variables.
*****************************************************************************/
struct
aout_sys_t
{
arts_stream_t
stream
;
mtime_t
latency
;
int
i_size
;
};
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static
int
Open
(
vlc_object_t
*
);
static
void
Close
(
vlc_object_t
*
);
static
void
Play
(
aout_instance_t
*
);
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin
()
set_shortname
(
"aRts"
)
set_description
(
N_
(
"aRts audio output"
)
)
set_capability
(
"audio output"
,
50
)
set_category
(
CAT_AUDIO
)
set_subcategory
(
SUBCAT_AUDIO_AOUT
)
set_callbacks
(
Open
,
Close
)
vlc_module_end
()
/*****************************************************************************
* Open: open an aRts socket
*****************************************************************************/
static
int
Open
(
vlc_object_t
*
p_this
)
{
aout_instance_t
*
p_aout
=
(
aout_instance_t
*
)
p_this
;
struct
aout_sys_t
*
p_sys
;
int
i_err
;
int
i_nb_channels
;
/* Allocate structure */
p_sys
=
malloc
(
sizeof
(
aout_sys_t
)
);
if
(
p_sys
==
NULL
)
return
VLC_ENOMEM
;
p_aout
->
output
.
p_sys
=
p_sys
;
i_err
=
arts_init
();
if
(
i_err
<
0
)
{
msg_Err
(
p_aout
,
"arts_init failed (%s)"
,
arts_error_text
(
i_err
)
);
free
(
p_sys
);
return
VLC_EGENERIC
;
}
p_aout
->
output
.
pf_play
=
Play
;
aout_VolumeSoftInit
(
p_aout
);
p_aout
->
output
.
output
.
i_format
=
AOUT_FMT_S16_NE
;
i_nb_channels
=
aout_FormatNbChannels
(
&
p_aout
->
output
.
output
);
if
(
i_nb_channels
>
2
)
{
/* aRts doesn't support more than two channels. */
i_nb_channels
=
2
;
p_aout
->
output
.
output
.
i_physical_channels
=
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
;
}
/* Open a socket for playing a stream, set format to 16 bits */
p_sys
->
stream
=
arts_play_stream
(
p_aout
->
output
.
output
.
i_rate
,
16
,
i_nb_channels
,
"vlc"
);
if
(
p_sys
->
stream
==
NULL
)
{
msg_Err
(
p_aout
,
"cannot open aRts socket"
);
free
(
p_sys
);
return
VLC_EGENERIC
;
}
/* Try not to bufferize more than 200 ms */
arts_stream_set
(
p_sys
->
stream
,
ARTS_P_BUFFER_TIME
,
50
);
/* Estimate latency with a half full buffer */
p_sys
->
latency
=
(
mtime_t
)
1000
*
(
mtime_t
)
arts_stream_get
(
p_sys
->
stream
,
ARTS_P_SERVER_LATENCY
);
p_sys
->
i_size
=
arts_stream_get
(
p_sys
->
stream
,
ARTS_P_PACKET_SIZE
);
msg_Dbg
(
p_aout
,
"aRts initialized, latency %i000, %i packets of size %i"
,
arts_stream_get
(
p_sys
->
stream
,
ARTS_P_SERVER_LATENCY
),
arts_stream_get
(
p_sys
->
stream
,
ARTS_P_PACKET_COUNT
),
arts_stream_get
(
p_sys
->
stream
,
ARTS_P_PACKET_SIZE
)
);
p_aout
->
output
.
i_nb_samples
=
p_sys
->
i_size
/
sizeof
(
uint16_t
)
/
i_nb_channels
;
return
VLC_SUCCESS
;
}
/*****************************************************************************
* Play: nothing to do
*****************************************************************************/
static
void
Play
(
aout_instance_t
*
p_aout
)
{
struct
aout_sys_t
*
p_sys
=
p_aout
->
output
.
p_sys
;
aout_buffer_t
*
p_buffer
;
int
i_tmp
;
#if 0
while( arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) < 16384*3/2 )
{
msleep( 10000 );
}
#endif
p_buffer
=
aout_FifoPop
(
p_aout
,
&
p_aout
->
output
.
fifo
);
if
(
p_buffer
!=
NULL
)
{
i_tmp
=
arts_write
(
p_sys
->
stream
,
p_buffer
->
p_buffer
,
p_buffer
->
i_nb_bytes
);
if
(
i_tmp
<
0
)
{
msg_Err
(
p_aout
,
"write failed (%s)"
,
arts_error_text
(
i_tmp
)
);
}
aout_BufferFree
(
p_buffer
);
}
}
/*****************************************************************************
* Close: close the aRts socket
*****************************************************************************/
static
void
Close
(
vlc_object_t
*
p_this
)
{
aout_instance_t
*
p_aout
=
(
aout_instance_t
*
)
p_this
;
struct
aout_sys_t
*
p_sys
=
p_aout
->
output
.
p_sys
;
arts_close_stream
(
p_sys
->
stream
);
arts_free
();
free
(
p_sys
);
}
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