/*****************************************************************************
* jack.c : JACK audio output module
*****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006 VLC authors and VideoLAN
* $Id$
*
* Authors: Cyril Deguet <asmax _at_ videolan.org>
* Jon Griffiths <jon_p_griffiths _At_ yahoo _DOT_ com>
*
- * 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser 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.
*****************************************************************************/
/**
* \file modules/audio_output/jack.c
jack_sample_t **p_jack_buffers;
unsigned int i_channels;
jack_nframes_t latency;
+ float soft_gain;
+ bool soft_mute;
};
/*****************************************************************************
static int Process ( jack_nframes_t i_frames, void *p_arg );
static int GraphChange ( void *p_arg );
+#include "volume.h"
+
#define AUTO_CONNECT_OPTION "jack-auto-connect"
#define AUTO_CONNECT_TEXT N_("Automatically connect to writable clients")
#define AUTO_CONNECT_LONGTEXT N_( \
AUTO_CONNECT_LONGTEXT, false )
add_string( CONNECT_REGEX_OPTION, "system", CONNECT_REGEX_TEXT,
CONNECT_REGEX_LONGTEXT, false )
+ add_sw_gain( )
set_callbacks( Open, Close )
vlc_module_end ()
-/*****************************************************************************
- * Open: create a JACK client
- *****************************************************************************/
-static int Open( vlc_object_t *p_this )
+
+static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
{
char psz_name[32];
- audio_output_t *p_aout = (audio_output_t *)p_this;
- struct aout_sys_t *p_sys = NULL;
+ struct aout_sys_t *p_sys = p_aout->sys;
int status = VLC_SUCCESS;
unsigned int i;
int i_error;
- /* Allocate structure */
- p_sys = calloc( 1, sizeof( aout_sys_t ) );
- if( p_sys == NULL )
- {
- status = VLC_ENOMEM;
- goto error_out;
- }
- p_aout->sys = p_sys;
p_sys->latency = 0;
/* Connect to the JACK server */
jack_set_graph_order_callback ( p_sys->p_jack_client, GraphChange, p_aout );
/* JACK only supports fl32 format */
- p_aout->format.i_format = VLC_CODEC_FL32;
+ fmt->i_format = VLC_CODEC_FL32;
// TODO add buffer size callback
- p_aout->format.i_rate = jack_get_sample_rate( p_sys->p_jack_client );
+ fmt->i_rate = jack_get_sample_rate( p_sys->p_jack_client );
- p_aout->pf_play = aout_PacketPlay;
- p_aout->pf_pause = aout_PacketPause;
- p_aout->pf_flush = aout_PacketFlush;
+ p_aout->time_get = aout_PacketTimeGet;
+ p_aout->play = aout_PacketPlay;
+ p_aout->pause = NULL;
+ p_aout->flush = aout_PacketFlush;
aout_PacketInit( p_aout, &p_sys->packet,
- jack_get_buffer_size( p_sys->p_jack_client ) );
- aout_VolumeSoftInit( p_aout );
+ jack_get_buffer_size( p_sys->p_jack_client ), fmt );
+ aout_SoftVolumeStart( p_aout );
- p_sys->i_channels = aout_FormatNbChannels( &p_aout->format );
+ p_sys->i_channels = aout_FormatNbChannels( fmt );
p_sys->p_jack_ports = malloc( p_sys->i_channels *
sizeof(jack_port_t *) );
}
msg_Dbg( p_aout, "JACK audio output initialized (%d channels, rate=%d)",
- p_sys->i_channels, p_aout->format.i_rate );
+ p_sys->i_channels, fmt->i_rate );
error_out:
/* Clean up, if an error occurred */
}
free( p_sys->p_jack_ports );
free( p_sys->p_jack_buffers );
- free( p_sys );
}
return status;
}
/*****************************************************************************
* Close: close the JACK client
*****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static void Stop( audio_output_t *p_aout )
{
int i_error;
- audio_output_t *p_aout = (audio_output_t *)p_this;
struct aout_sys_t *p_sys = p_aout->sys;
i_error = jack_deactivate( p_sys->p_jack_client );
free( p_sys->p_jack_ports );
free( p_sys->p_jack_buffers );
aout_PacketDestroy( p_aout );
- free( p_sys );
+}
+
+static int Open(vlc_object_t *obj)
+{
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = calloc(1, sizeof (*sys));
+
+ if (unlikely(sys == NULL))
+ return VLC_ENOMEM;
+ aout->sys = sys;
+ aout->start = Start;
+ aout->stop = Stop;
+ aout_SoftVolumeInit(aout);
+ return VLC_SUCCESS;
+}
+
+static void Close(vlc_object_t *obj)
+{
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = aout->sys;
+
+ free(sys);
}
projects / vlc / blobdiff