fixed high quality, l10n issues
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@464 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
/*
|
||||
* audio_alsa.cpp - device-class which implements ALSA-PCM-output
|
||||
*
|
||||
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -237,7 +237,9 @@ void audioALSA::run( void )
|
||||
{
|
||||
if( outbuf_pos == 0 )
|
||||
{
|
||||
// frames depend on the sample rate
|
||||
const fpab_t frames = getNextBuffer( temp );
|
||||
outbuf_size = frames * channels();
|
||||
|
||||
convertToS16( temp, frames,
|
||||
getMixer()->masterGain(),
|
||||
@@ -355,7 +357,7 @@ int audioALSA::setHWParams( const sample_rate_t _sample_rate,
|
||||
else
|
||||
{
|
||||
SAMPLE_RATES[0] = 44100;
|
||||
SAMPLE_RATES[1] = 82000;
|
||||
SAMPLE_RATES[1] = 88200;
|
||||
}
|
||||
setSampleRate( SAMPLE_RATES[q] );
|
||||
if( ( err = snd_pcm_hw_params_set_rate( m_handle, m_hwParams,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/*
|
||||
* audio_oss.cpp - device-class that implements OSS-PCM-output
|
||||
*
|
||||
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -216,7 +216,7 @@ audioOSS::audioOSS( const sample_rate_t _sample_rate, bool & _success_ful,
|
||||
else
|
||||
{
|
||||
SAMPLE_RATES[0] = 44100;
|
||||
SAMPLE_RATES[1] = 82000;
|
||||
SAMPLE_RATES[1] = 88200;
|
||||
}
|
||||
setSampleRate( SAMPLE_RATES[q] );
|
||||
value = sampleRate();
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/*
|
||||
* audio_sdl.cpp - device-class that performs PCM-output via SDL
|
||||
*
|
||||
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -165,7 +165,10 @@ void audioSDL::sdlAudioCallback( Uint8 * _buf, int _len )
|
||||
{
|
||||
if( m_convertedBuf_pos == 0 )
|
||||
{
|
||||
// frames depend on the sample rate
|
||||
const fpab_t frames = getNextBuffer( m_outBuf );
|
||||
m_convertedBuf_size = frames * channels()
|
||||
* sizeof( int_sample_t );
|
||||
|
||||
convertToS16( m_outBuf, frames,
|
||||
getMixer()->masterGain(),
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/*
|
||||
* setup_dialog.cpp - dialog for setting up LMMS
|
||||
*
|
||||
* Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -555,20 +555,26 @@ setupDialog::setupDialog( engine * _engine, configTabs _tab_to_open ) :
|
||||
for( aswMap::iterator it = m_audioIfaceSetupWidgets.begin();
|
||||
it != m_audioIfaceSetupWidgets.end(); ++it )
|
||||
{
|
||||
m_audioIfaceNames[tr( it.key() )] = it.key();
|
||||
}
|
||||
for( trMap::iterator it = m_audioIfaceNames.begin();
|
||||
it != m_audioIfaceNames.end(); ++it )
|
||||
{
|
||||
#ifdef QT4
|
||||
it.value()->hide();
|
||||
asw_layout->addWidget( it.value() );
|
||||
QWidget * audioWidget = m_audioIfaceSetupWidgets[it.value()];
|
||||
#else
|
||||
it.data()->hide();
|
||||
asw_layout->addWidget( it.data() );
|
||||
QWidget * audioWidget = m_audioIfaceSetupWidgets[it.data()];
|
||||
#endif
|
||||
audioWidget->hide();
|
||||
asw_layout->addWidget( audioWidget );
|
||||
m_audioInterfaces->addItem( it.key() );
|
||||
}
|
||||
#ifdef QT4
|
||||
m_audioInterfaces->setCurrentIndex( m_audioInterfaces->findText(
|
||||
eng()->getMixer()->audioDevName() ) );
|
||||
tr( eng()->getMixer()->audioDevName() ) ) );
|
||||
#else
|
||||
m_audioInterfaces->setCurrentText( eng()->getMixer()->audioDevName() );
|
||||
m_audioInterfaces->setCurrentText(
|
||||
tr( eng()->getMixer()->audioDevName() ) );
|
||||
#endif
|
||||
m_audioIfaceSetupWidgets[eng()->getMixer()->audioDevName()]->show();
|
||||
|
||||
@@ -635,21 +641,27 @@ setupDialog::setupDialog( engine * _engine, configTabs _tab_to_open ) :
|
||||
for( mswMap::iterator it = m_midiIfaceSetupWidgets.begin();
|
||||
it != m_midiIfaceSetupWidgets.end(); ++it )
|
||||
{
|
||||
m_midiIfaceNames[tr( it.key() )] = it.key();
|
||||
}
|
||||
for( trMap::iterator it = m_midiIfaceNames.begin();
|
||||
it != m_midiIfaceNames.end(); ++it )
|
||||
{
|
||||
#ifdef QT4
|
||||
it.value()->hide();
|
||||
msw_layout->addWidget( it.value() );
|
||||
QWidget * midiWidget = m_midiIfaceSetupWidgets[it.value()];
|
||||
#else
|
||||
msw_layout->addWidget( it.data() );
|
||||
it.data()->hide();
|
||||
QWidget * midiWidget = m_midiIfaceSetupWidgets[it.data()];
|
||||
#endif
|
||||
midiWidget->hide();
|
||||
msw_layout->addWidget( midiWidget );
|
||||
m_midiInterfaces->addItem( it.key() );
|
||||
}
|
||||
|
||||
#ifdef QT4
|
||||
m_midiInterfaces->setCurrentIndex( m_midiInterfaces->findText(
|
||||
eng()->getMixer()->midiClientName() ) );
|
||||
tr( eng()->getMixer()->midiClientName() ) ) );
|
||||
#else
|
||||
m_midiInterfaces->setCurrentText( eng()->getMixer()->midiClientName() );
|
||||
m_midiInterfaces->setCurrentText(
|
||||
tr( eng()->getMixer()->midiClientName() ) );
|
||||
#endif
|
||||
m_midiIfaceSetupWidgets[eng()->getMixer()->midiClientName()]->show();
|
||||
|
||||
@@ -737,9 +749,9 @@ void setupDialog::accept( void )
|
||||
configManager::inst()->setValue( "mixer", "framesperaudiobuffer",
|
||||
QString::number( m_bufferSize ) );
|
||||
configManager::inst()->setValue( "mixer", "audiodev",
|
||||
m_audioInterfaces->currentText() );
|
||||
m_audioIfaceNames[m_audioInterfaces->currentText()] );
|
||||
configManager::inst()->setValue( "mixer", "mididev",
|
||||
m_midiInterfaces->currentText() );
|
||||
m_midiIfaceNames[m_midiInterfaces->currentText()] );
|
||||
configManager::inst()->setValue( "tooltips", "disabled",
|
||||
QString::number( m_disableToolTips ) );
|
||||
configManager::inst()->setValue( "knobs", "classicalusability",
|
||||
@@ -1122,7 +1134,7 @@ void setupDialog::audioInterfaceChanged( const QString & _iface )
|
||||
#endif
|
||||
}
|
||||
|
||||
m_audioIfaceSetupWidgets[_iface]->show();
|
||||
m_audioIfaceSetupWidgets[m_audioIfaceNames[_iface]]->show();
|
||||
}
|
||||
|
||||
|
||||
@@ -1160,7 +1172,7 @@ void setupDialog::midiInterfaceChanged( const QString & _iface )
|
||||
#endif
|
||||
}
|
||||
|
||||
m_midiIfaceSetupWidgets[_iface]->show();
|
||||
m_midiIfaceSetupWidgets[m_midiIfaceNames[_iface]]->show();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user