hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixed high quality, l10n issues

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@464 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2007-02-28 22:35:33 +00:00
parent ebf8d3e6ec
commit c77e194a53
21 changed files with 1031 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@@ -1,3 +1,32 @@
2007-02-28 Javier Serrano Polo <jasp00/at/terra/dot/es>
* src/audio/audio_alsa.cpp:
* src/audio/audio_sdl.cpp:
fixed high quality play
* include/audio_alsa.h:
* include/audio_device.h:
* include/audio_dummy.h:
* include/audio_jack.h:
* include/audio_oss.h:
* include/audio_sdl.h:
* include/midi_alsa_raw.h:
* include/midi_alsa_seq.h
* include/midi_client.h:
* include/midi_dummy.h:
* include/midi_oss.h:
* include/setup_dialog.h:
* src/core/setup_dialog.cpp:
save device names without localization
* data/locale/ca.ts:
updated translation
* plugins/lb302/lb302.cpp:
* src/audio/audio_alsa.cpp:
* src/audio/audio_oss.cpp:
fixed typos
2007-02-27 Javier Serrano Polo <jasp00/at/terra/dot/es>
* src/widgets/fade_button.cpp:

4
configure.in
View File

@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(lmms, 0.2.1-svn20070227, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20070227)
AC_INIT(lmms, 0.2.1-svn20070228, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20070228)
AM_CONFIG_HEADER(config.h)

BIN
data/locale/ca.qm
View File

Binary file not shown.

950
data/locale/ca.ts
View File

File diff suppressed because it is too large Load Diff

6
include/audio_alsa.h
View File

@@ -1,7 +1,7 @@
/*
* audio_alsa.h - device-class that 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
*
@@ -57,8 +57,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "ALSA (Advanced Linux Sound "
"Architecture)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"ALSA (Advanced Linux Sound Architecture)" ) );
}
static QString probeDevice( void );

4
include/audio_device.h
View File

@@ -1,7 +1,7 @@
/*
* audio_device.h - base-class for audio-devices, used by LMMS-mixer
*
* 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
*
@@ -113,7 +113,7 @@ public:
public:
setupWidget( const QString & _caption, QWidget * _parent ) :
tabWidget( tabWidget::tr( "Settings for %1" ).arg(
_caption ).toUpper(), _parent )
tr( _caption ) ).toUpper(), _parent )
{
}

5
include/audio_dummy.h
View File

@@ -1,7 +1,7 @@
/*
* audio_dummy.h - dummy-audio-device
*
* 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
*
@@ -48,7 +48,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "Dummy (no sound output)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"Dummy (no sound output)" ) );
}

5
include/audio_jack.h
View File

@@ -1,7 +1,7 @@
/*
* audio_jack.h - support for JACK-transport
*
* 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
*
@@ -73,7 +73,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "JACK (JACK Audio Connection Kit)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"JACK (JACK Audio Connection Kit)" ) );
}

5
include/audio_oss.h
View File

@@ -1,7 +1,7 @@
/*
* audio_oss.h - 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
*
@@ -53,7 +53,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "OSS (Open Sound System)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"OSS (Open Sound System)" ) );
}
static QString probeDevice( void );

5
include/audio_sdl.h
View File

@@ -1,7 +1,7 @@
/*
* audio_sdl.h - 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
*
@@ -57,7 +57,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "SDL (Simple DirectMedia Layer)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"SDL (Simple DirectMedia Layer)" ) );
}

6
include/midi_alsa_raw.h
View File

@@ -1,7 +1,7 @@
/*
* midi_alsa_raw.h - midi-client for RawMIDI via ALSA
*
* 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
*
@@ -69,8 +69,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "ALSA Raw-MIDI (Advanced Linux Sound "
"Architecture)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"ALSA Raw-MIDI (Advanced Linux Sound Architecture)" ) );
}

5
include/midi_alsa_seq.h
View File

@@ -1,7 +1,7 @@
/*
* midi_alsa_seq.h - ALSA-sequencer-client
*
* 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
*
@@ -79,7 +79,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "ALSA-Sequencer (Advanced Linux Sound "
return( QT_TRANSLATE_NOOP( "setupWidget",
"ALSA-Sequencer (Advanced Linux Sound "
"Architecture)" ) );
}

4
include/midi_client.h
View File

@@ -1,7 +1,7 @@
/*
* midi_client.h - base-class for MIDI-clients like ALSA-sequencer-client
*
* 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
*
@@ -117,7 +117,7 @@ public:
public:
setupWidget( const QString & _caption, QWidget * _parent ) :
tabWidget( tabWidget::tr( "Settings for %1" ).arg(
_caption ).toUpper(), _parent )
tr( _caption ) ).toUpper(), _parent )
{
}

5
include/midi_dummy.h
View File

@@ -1,7 +1,7 @@
/*
* midi_dummy.h - dummy MIDI-driver
*
* 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
*
@@ -45,7 +45,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "Dummy (no MIDI support)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"Dummy (no MIDI support)" ) );
}

5
include/midi_oss.h
View File

@@ -1,7 +1,7 @@
/*
* midi_oss.h - OSS-raw-midi-client
*
* 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
*
@@ -51,7 +51,8 @@ public:
inline static QString name( void )
{
return( setupWidget::tr( "OSS Raw-MIDI (Open Sound System)" ) );
return( QT_TRANSLATE_NOOP( "setupWidget",
"OSS Raw-MIDI (Open Sound System)" ) );
}

5
include/setup_dialog.h
View File

@@ -1,7 +1,7 @@
/*
* setup_dialog.h - 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
*
@@ -155,12 +155,15 @@ private:
typedef QMap<QString, audioDevice::setupWidget *> aswMap;
typedef QMap<QString, midiClient::setupWidget *> mswMap;
typedef QMap<QString, QString> trMap;
QComboBox * m_audioInterfaces;
aswMap m_audioIfaceSetupWidgets;
trMap m_audioIfaceNames;
QComboBox * m_midiInterfaces;
mswMap m_midiIfaceSetupWidgets;
trMap m_midiIfaceNames;
} ;

2
plugins/lb302/lb302.cpp
View File

@@ -345,7 +345,7 @@ lb302Synth::lb302Synth( instrumentTrack * _channel_track ) :
wave_knob->setRange( 0.0f, 5.0f, 1.0f ); // Originally [0,1.0]
wave_knob->setInitValue( 0.0f );
wave_knob->move( 120, 75 );
wave_knob->setHintText( tr( "EAVE:" ) + " ", "" );
wave_knob->setHintText( tr( "WAVE:" ) + " ", "" );
wave_knob->setLabel( tr( "WAVE"));

6
src/audio/audio_alsa.cpp
View File

@@ -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,

4
src/audio/audio_oss.cpp
View File

@@ -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();

5
src/audio/audio_sdl.cpp
View File

@@ -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(),

46
src/core/setup_dialog.cpp
View File

@@ -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();
}