eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

possible fix for nosound operation

Browse source
This commit is contained in:
Volker Fischer 2013-02-19 15:26:58 +00:00
parent 42e13fe56c
commit fd0e198d62
1 changed files with 102 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

209
linux/sound.h
View file

@ -1,107 +1,102 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2011 * Copyright (c) 2004-2011
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer
* *
****************************************************************************** ******************************************************************************
* *
* This program is free software; you can redistribute it and/or modify it under * 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 * 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 * Foundation; either version 2 of the License, or (at your option) any later
* version. * version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * 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 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
\******************************************************************************/ \******************************************************************************/
#if !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_) #if !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_)
#define _SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_ #define _SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <QThread> #include <QThread>
#include <string.h> #include <string.h>
#include "util.h" #include "util.h"
#include "soundbase.h" #include "soundbase.h"
#include "global.h" #include "global.h"
#if WITH_SOUND #if WITH_SOUND
# include <jack/jack.h> # include <jack/jack.h>
#endif #endif
/* Definitions ****************************************************************/ /* Definitions ****************************************************************/
#define NUM_IN_OUT_CHANNELS 2 // always stereo #define NUM_IN_OUT_CHANNELS 2 // always stereo
// the number of periods is critical for latency // the number of periods is critical for latency
#define NUM_PERIOD_BLOCKS_IN 2 #define NUM_PERIOD_BLOCKS_IN 2
#define NUM_PERIOD_BLOCKS_OUT 1 #define NUM_PERIOD_BLOCKS_OUT 1
#define MAX_SND_BUF_IN 200 #define MAX_SND_BUF_IN 200
#define MAX_SND_BUF_OUT 200 #define MAX_SND_BUF_OUT 200
/* Classes ********************************************************************/ /* Classes ********************************************************************/
#if WITH_SOUND #if WITH_SOUND
class CSound : public CSoundBase class CSound : public CSoundBase
{ {
public: public:
CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg ) : CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg ) :
CSoundBase ( "Jack", true, fpNewProcessCallback, arg ), iJACKBufferSizeMono ( 0 ), CSoundBase ( "Jack", true, fpNewProcessCallback, arg ), iJACKBufferSizeMono ( 0 ),
iJACKBufferSizeStero ( 0 ) { OpenJack(); } iJACKBufferSizeStero ( 0 ) { OpenJack(); }
virtual ~CSound() { CloseJack(); } virtual ~CSound() { CloseJack(); }
virtual int Init ( const int iNewPrefMonoBufferSize ); virtual int Init ( const int iNewPrefMonoBufferSize );
virtual void Start(); virtual void Start();
virtual void Stop(); virtual void Stop();
// these variables should be protected but cannot since we want // these variables should be protected but cannot since we want
// to access them from the callback function // to access them from the callback function
CVector<short> vecsTmpAudioSndCrdStereo; CVector<short> vecsTmpAudioSndCrdStereo;
int iJACKBufferSizeMono; int iJACKBufferSizeMono;
int iJACKBufferSizeStero; int iJACKBufferSizeStero;
jack_port_t* input_port_left; jack_port_t* input_port_left;
jack_port_t* input_port_right; jack_port_t* input_port_right;
jack_port_t* output_port_left; jack_port_t* output_port_left;
jack_port_t* output_port_right; jack_port_t* output_port_right;
protected: protected:
void OpenJack(); void OpenJack();
void CloseJack(); void CloseJack();
// callbacks // callbacks
static int process ( jack_nframes_t nframes, void* arg ); static int process ( jack_nframes_t nframes, void* arg );
static int bufferSizeCallback ( jack_nframes_t, void *arg ); static int bufferSizeCallback ( jack_nframes_t, void *arg );
static void shutdownCallback ( void* ); static void shutdownCallback ( void* );
jack_client_t* pJackClient; jack_client_t* pJackClient;
}; };
#else #else
// no sound -> dummy class definition // no sound -> dummy class definition
class CSound : public CSoundBase class CSound : public CSoundBase
{ {
public: public:
CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* pParg ), void* pParg ) : CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* pParg ), void* pParg ) :
CSoundBase ( false, fpNewProcessCallback, pParg ) {} CSoundBase ( "nosound", false, fpNewProcessCallback, pParg ) {}
virtual ~CSound() {} virtual ~CSound() {}
};
// dummy definitions #endif // WITH_SOUND
virtual int Init ( const int iNewPrefMonoBufferSize ) { return CSoundBase::Init ( iNewPrefMonoBufferSize ); }
virtual bool Read ( CVector<short>& ) { printf ( "no sound!" ); return false; } #endif // !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_)
virtual bool Write ( CVector<short>& ) { printf ( "no sound!" ); return false; }
};
#endif // WITH_SOUND
#endif // !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_)