* sf2Player: retrieve resampling-interpolation from current mixer quality settings

* mixer: made m_writing-variable in fifoWriter volatile
* projectRenderer: change audio-device to file-device from within GUI-thread in order to make slots being connected to sampleRateChanged()-signal being called 
immediately
* audioDevice: made HQ-mode for audio-devices optional



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@959 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-05-11 23:21:33 +00:00
parent e32eed940f
commit 7598cd7a8e
17 changed files with 157 additions and 81 deletions

View File

@@ -162,6 +162,8 @@ protected:
return( m_mixer );
}
bool hqAudio( void ) const;
private:
sample_rate_t m_sampleRate;

View File

@@ -412,7 +412,7 @@ private:
private:
mixer * m_mixer;
fifo * m_fifo;
bool m_writing;
volatile bool m_writing;
virtual void run( void );

View File

@@ -76,6 +76,7 @@ private:
audioFileDevice * m_fileDev;
mixer::qualitySettings m_qualitySettings;
mixer::qualitySettings m_oldQualitySettings;
volatile bool m_abort;

View File

@@ -1,7 +1,7 @@
/*
* setup_dialog.h - dialog for setting up LMMS
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -45,13 +45,16 @@ class setupDialog : public QDialog
{
Q_OBJECT
public:
enum configTabs
enum ConfigTabs
{
GENERAL_SETTINGS, DIRECTORY_SETTINGS, PERFORMANCE_SETTINGS,
AUDIO_SETTINGS, MIDI_SETTINGS
GeneralSettings,
DirectorySettings,
PerformanceSettings,
AudioSettings,
MidiSettings
} ;
setupDialog( configTabs _tab_to_open = GENERAL_SETTINGS );
setupDialog( ConfigTabs _tab_to_open = GeneralSettings );
virtual ~setupDialog();
@@ -89,6 +92,7 @@ private slots:
void toggleWarnAfterSetup( bool _enabled );
void toggleDisplaydBV( bool _enabled );
void toggleMMPZ( bool _enabled );
void toggleHQAudioDev( bool _enabled );
void openWorkingDir( void );
void openVSTDir( void );
@@ -115,6 +119,7 @@ private:
bool m_warnAfterSetup;
bool m_displaydBV;
bool m_MMPZ;
bool m_hqAudioDev;
QLineEdit * m_wdLineEdit;