From fd0e198d62f67f6ea7a85a46fd95d4d99deb9129 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Tue, 19 Feb 2013 15:26:58 +0000 Subject: [PATCH] possible fix for nosound operation --- linux/sound.h | 209 ++++++++++++++++++++++++-------------------------- 1 file changed, 102 insertions(+), 107 deletions(-) diff --git a/linux/sound.h b/linux/sound.h index 44dcb851..5ac67d2b 100755 --- a/linux/sound.h +++ b/linux/sound.h @@ -1,107 +1,102 @@ -/******************************************************************************\ - * Copyright (c) 2004-2011 - * - * Author(s): - * Volker Fischer - * - ****************************************************************************** - * - * 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., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -\******************************************************************************/ - -#if !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_) -#define _SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "util.h" -#include "soundbase.h" -#include "global.h" - -#if WITH_SOUND -# include -#endif - - -/* Definitions ****************************************************************/ -#define NUM_IN_OUT_CHANNELS 2 // always stereo - -// the number of periods is critical for latency -#define NUM_PERIOD_BLOCKS_IN 2 -#define NUM_PERIOD_BLOCKS_OUT 1 - -#define MAX_SND_BUF_IN 200 -#define MAX_SND_BUF_OUT 200 - - -/* Classes ********************************************************************/ -#if WITH_SOUND -class CSound : public CSoundBase -{ -public: - CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* arg ), void* arg ) : - CSoundBase ( "Jack", true, fpNewProcessCallback, arg ), iJACKBufferSizeMono ( 0 ), - iJACKBufferSizeStero ( 0 ) { OpenJack(); } - virtual ~CSound() { CloseJack(); } - - virtual int Init ( const int iNewPrefMonoBufferSize ); - virtual void Start(); - virtual void Stop(); - - // these variables should be protected but cannot since we want - // to access them from the callback function - CVector vecsTmpAudioSndCrdStereo; - int iJACKBufferSizeMono; - int iJACKBufferSizeStero; - - jack_port_t* input_port_left; - jack_port_t* input_port_right; - jack_port_t* output_port_left; - jack_port_t* output_port_right; - -protected: - void OpenJack(); - void CloseJack(); - - // callbacks - static int process ( jack_nframes_t nframes, void* arg ); - static int bufferSizeCallback ( jack_nframes_t, void *arg ); - static void shutdownCallback ( void* ); - jack_client_t* pJackClient; -}; -#else -// no sound -> dummy class definition -class CSound : public CSoundBase -{ -public: - CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* pParg ), void* pParg ) : - CSoundBase ( false, fpNewProcessCallback, pParg ) {} - virtual ~CSound() {} - - // dummy definitions - virtual int Init ( const int iNewPrefMonoBufferSize ) { return CSoundBase::Init ( iNewPrefMonoBufferSize ); } - virtual bool Read ( CVector& ) { printf ( "no sound!" ); return false; } - virtual bool Write ( CVector& ) { printf ( "no sound!" ); return false; } -}; -#endif // WITH_SOUND - -#endif // !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_) +/******************************************************************************\ + * Copyright (c) 2004-2011 + * + * Author(s): + * Volker Fischer + * + ****************************************************************************** + * + * 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., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * +\******************************************************************************/ + +#if !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_) +#define _SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "util.h" +#include "soundbase.h" +#include "global.h" + +#if WITH_SOUND +# include +#endif + + +/* Definitions ****************************************************************/ +#define NUM_IN_OUT_CHANNELS 2 // always stereo + +// the number of periods is critical for latency +#define NUM_PERIOD_BLOCKS_IN 2 +#define NUM_PERIOD_BLOCKS_OUT 1 + +#define MAX_SND_BUF_IN 200 +#define MAX_SND_BUF_OUT 200 + + +/* Classes ********************************************************************/ +#if WITH_SOUND +class CSound : public CSoundBase +{ +public: + CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* arg ), void* arg ) : + CSoundBase ( "Jack", true, fpNewProcessCallback, arg ), iJACKBufferSizeMono ( 0 ), + iJACKBufferSizeStero ( 0 ) { OpenJack(); } + virtual ~CSound() { CloseJack(); } + + virtual int Init ( const int iNewPrefMonoBufferSize ); + virtual void Start(); + virtual void Stop(); + + // these variables should be protected but cannot since we want + // to access them from the callback function + CVector vecsTmpAudioSndCrdStereo; + int iJACKBufferSizeMono; + int iJACKBufferSizeStero; + + jack_port_t* input_port_left; + jack_port_t* input_port_right; + jack_port_t* output_port_left; + jack_port_t* output_port_right; + +protected: + void OpenJack(); + void CloseJack(); + + // callbacks + static int process ( jack_nframes_t nframes, void* arg ); + static int bufferSizeCallback ( jack_nframes_t, void *arg ); + static void shutdownCallback ( void* ); + jack_client_t* pJackClient; +}; +#else +// no sound -> dummy class definition +class CSound : public CSoundBase +{ +public: + CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* pParg ), void* pParg ) : + CSoundBase ( "nosound", false, fpNewProcessCallback, pParg ) {} + virtual ~CSound() {} +}; +#endif // WITH_SOUND + +#endif // !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_)