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

bug fix

Browse source
This commit is contained in:
Volker Fischer 2008-11-01 08:47:31 +00:00
parent b807d001de
commit de13a71735
4 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/clientsettingsdlg.cpp
View file

@ -57,9 +57,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
TextNetBufSiFactOut->setWhatsThis ( strNetwBlockSize ); TextNetBufSiFactOut->setWhatsThis ( strNetwBlockSize );
GroupBoxNetwBuf->setWhatsThis ( strNetwBlockSize ); GroupBoxNetwBuf->setWhatsThis ( strNetwBlockSize );
// init timing jitter text label
//TextLabelStdDevTimer->setText ( "" );
// init delay information controls // init delay information controls
CLEDOverallDelay->SetUpdateTime ( 2 * PING_UPDATE_TIME ); CLEDOverallDelay->SetUpdateTime ( 2 * PING_UPDATE_TIME );
CLEDOverallDelay->Reset(); CLEDOverallDelay->Reset();
@ -341,16 +338,9 @@ void CClientSettingsDlg::OnPingTimeResult ( int iPingTime )
void CClientSettingsDlg::UpdateDisplay() void CClientSettingsDlg::UpdateDisplay()
{ {
if ( pClient->IsRunning() ) if ( !pClient->IsRunning() )
{
// response time
//TextLabelStdDevTimer->setText ( QString().
// setNum ( pClient->GetTimingStdDev(), 'f', 2 ) + " ms" );
}
else
{ {
// clear text labels with client parameters // clear text labels with client parameters
//TextLabelStdDevTimer->setText ( "" );
TextLabelPingTime->setText ( "" ); TextLabelPingTime->setText ( "" );
TextLabelBufferDelay->setText ( "" ); TextLabelBufferDelay->setText ( "" );
TextLabelOverallDelay->setText ( "" ); TextLabelOverallDelay->setText ( "" );

2
src/clientsettingsdlgbase.ui
View file

@ -910,7 +910,7 @@
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="lPingTime_3" > <widget class="QLabel" name="lPingTime_3" >

9
windows/sound.cpp
View file

@ -327,7 +327,7 @@ std::string CSound::LoadAndInitializeDriver ( int iDriverIdx )
return "The audio driver could not be initialized."; return "The audio driver could not be initialized.";
} }
const std::string strStat = GetAndCheckSoundCardProperties(); const std::string strStat = PrepareDriver();
// store ID of selected driver if initialization was successful // store ID of selected driver if initialization was successful
if ( strStat.empty() ) if ( strStat.empty() )
@ -351,7 +351,7 @@ bool CSound::LoadAndInitializeFirstValidDriver()
{ {
if ( ASIOInit ( &driverInfo ) == ASE_OK ) if ( ASIOInit ( &driverInfo ) == ASE_OK )
{ {
if ( GetAndCheckSoundCardProperties().empty() ) if ( PrepareDriver().empty() )
{ {
// initialization was successful // initialization was successful
bValidDriverDetected = true; bValidDriverDetected = true;
@ -379,7 +379,7 @@ bool CSound::LoadAndInitializeFirstValidDriver()
return bValidDriverDetected; return bValidDriverDetected;
} }
std::string CSound::GetAndCheckSoundCardProperties() std::string CSound::PrepareDriver()
{ {
int i; int i;
@ -592,9 +592,6 @@ void CSound::Close()
// wait for the thread to terminate // wait for the thread to terminate
Sleep ( 500 ); Sleep ( 500 );
// dispose ASIO buffers
ASIODisposeBuffers();
// set flag to open devices the next time it is initialized // set flag to open devices the next time it is initialized
bChangParamIn = true; bChangParamIn = true;
bChangParamOut = true; bChangParamOut = true;

2
windows/sound.h
View file

@ -97,7 +97,7 @@ public:
protected: protected:
bool LoadAndInitializeFirstValidDriver(); bool LoadAndInitializeFirstValidDriver();
std::string LoadAndInitializeDriver ( int iIdx ); std::string LoadAndInitializeDriver ( int iIdx );
std::string GetAndCheckSoundCardProperties(); std::string PrepareDriver();
void InitRecordingAndPlayback(); void InitRecordingAndPlayback();
// audio hardware buffer info // audio hardware buffer info