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

Mixer: renamed class and file name

Browse Source 
The mixer class is now named "Mixer" and accessible via engine::mixer().
This commit is contained in:
Tobias Doerffel
2014-01-08 22:35:14 +01:00
parent 40290117ff
commit 0ff1f91c1b
107 changed files with 509 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AudioAlsa.h
View File

@@ -44,7 +44,7 @@ class QLineEdit;
class AudioAlsa : public AudioDevice, public QThread
{
public:
AudioAlsa( bool & _success_ful, mixer * _mixer );
AudioAlsa( bool & _success_ful, Mixer* mixer );
virtual ~AudioAlsa();
inline static QString name()

8
include/AudioDevice.h
View File

@@ -29,7 +29,7 @@
#include <QtCore/QMutex>
#include <QtCore/QThread>
#include "mixer.h"
#include "Mixer.h"
#include "tab_widget.h"
@@ -39,7 +39,7 @@ class AudioPort;
class AudioDevice
{
public:
AudioDevice( const ch_cnt_t _channels, mixer * _mixer );
AudioDevice( const ch_cnt_t _channels, Mixer* mixer );
virtual ~AudioDevice();
inline void lock()
@@ -152,7 +152,7 @@ protected:
m_sampleRate = _new_sr;
}
mixer * getMixer()
Mixer* mixer()
{
return m_mixer;
}
@@ -167,7 +167,7 @@ protected:
private:
sample_rate_t m_sampleRate;
ch_cnt_t m_channels;
mixer * m_mixer;
Mixer* m_mixer;
bool m_inProcess;
QMutex m_devMutex;

10
include/AudioDummy.h
View File

@@ -32,8 +32,8 @@
class AudioDummy : public AudioDevice, public QThread
{
public:
AudioDummy( bool & _success_ful, mixer * _mixer ) :
AudioDevice( DEFAULT_CHANNELS, _mixer )
AudioDummy( bool & _success_ful, Mixer* mixer ) :
AudioDevice( DEFAULT_CHANNELS, mixer )
{
_success_ful = true;
}
@@ -96,7 +96,7 @@ private:
{
timer.reset();
const surroundSampleFrame * b =
getMixer()->nextBuffer();
mixer()->nextBuffer();
if( !b )
{
break;
@@ -104,9 +104,9 @@ private:
delete[] b;
const Sint32 microseconds = static_cast<Sint32>(
getMixer()->framesPerPeriod() *
mixer()->framesPerPeriod() *
1000000.0f /
getMixer()->processingSampleRate() -
mixer()->processingSampleRate() -
timer.elapsed() );
if( microseconds > 0 )
{

4
include/AudioFileDevice.h
View File

@@ -41,7 +41,7 @@ public:
const bitrate_t _min_bitrate,
const bitrate_t _max_bitrate,
const int _depth,
mixer * _mixer );
Mixer* mixer );
virtual ~AudioFileDevice();
QString outputFile() const
@@ -108,7 +108,7 @@ typedef AudioFileDevice * ( * AudioFileDeviceInstantiaton )
const bitrate_t _min_bitrate,
const bitrate_t _max_bitrate,
const int _depth,
mixer * _mixer );
Mixer* mixer );
#endif

6
include/AudioFileOgg.h
View File

@@ -47,7 +47,7 @@ public:
const bitrate_t _min_bitrate,
const bitrate_t _max_bitrate,
const int _depth,
mixer * _mixer );
Mixer* mixer );
virtual ~AudioFileOgg();
static AudioFileDevice * getInst( const sample_rate_t _sample_rate,
@@ -59,12 +59,12 @@ public:
const bitrate_t _min_bitrate,
const bitrate_t _max_bitrate,
const int _depth,
mixer * _mixer )
Mixer* mixer )
{
return new AudioFileOgg( _sample_rate, _channels, _success_ful,
_file, _use_vbr, _nom_bitrate,
_min_bitrate, _max_bitrate,
_depth, _mixer );
_depth, mixer );
}

6
include/AudioFileWave.h
View File

@@ -44,7 +44,7 @@ public:
const bitrate_t _min_bitrate,
const bitrate_t _max_bitrate,
const int _depth,
mixer * _mixer );
Mixer* mixer );
virtual ~AudioFileWave();
static AudioFileDevice * getInst( const sample_rate_t _sample_rate,
@@ -56,13 +56,13 @@ public:
const bitrate_t _min_bitrate,
const bitrate_t _max_bitrate,
const int _depth,
mixer * _mixer )
Mixer* mixer )
{
return new AudioFileWave( _sample_rate, _channels,
_success_ful, _file, _use_vbr,
_nom_bitrate, _min_bitrate,
_max_bitrate, _depth,
_mixer );
mixer );
}

2
include/AudioJack.h
View File

@@ -46,7 +46,7 @@ class AudioJack : public QObject, public AudioDevice
{
Q_OBJECT
public:
AudioJack( bool & _success_ful, mixer * _mixer );
AudioJack( bool & _success_ful, Mixer* mixer );
virtual ~AudioJack();
inline static QString name()

2
include/AudioOss.h
View File

@@ -39,7 +39,7 @@ class QLineEdit;
class AudioOss : public AudioDevice, public QThread
{
public:
AudioOss( bool & _success_ful, mixer * _mixer );
AudioOss( bool & _success_ful, Mixer* mixer );
virtual ~AudioOss();
inline static QString name()

4
include/AudioPort.h
View File

@@ -29,7 +29,7 @@
#include <QtCore/QMutex>
#include <QtCore/QMutexLocker>
#include "mixer.h"
#include "Mixer.h"
class EffectChain;
@@ -134,7 +134,7 @@ private:
EffectChain * m_effects;
friend class mixer;
friend class Mixer;
friend class MixerWorkerThread;
} ;

2
include/AudioPortAudio.h
View File

@@ -63,7 +63,7 @@ class lcdSpinBox;
class AudioPortAudio : public AudioDevice
{
public:
AudioPortAudio( bool & _success_ful, mixer * _mixer );
AudioPortAudio( bool & _success_ful, Mixer* mixer );
virtual ~AudioPortAudio();
inline static QString name()

2
include/AudioPulseAudio.h
View File

@@ -41,7 +41,7 @@ class QLineEdit;
class AudioPulseAudio : public AudioDevice, public QThread
{
public:
AudioPulseAudio( bool & _success_ful, mixer * _mixer );
AudioPulseAudio( bool & _success_ful, Mixer* mixer );
virtual ~AudioPulseAudio();
inline static QString name()

2
include/AudioSampleRecorder.h
View File

@@ -38,7 +38,7 @@ class AudioSampleRecorder : public AudioDevice
{
public:
AudioSampleRecorder( const ch_cnt_t _channels, bool & _success_ful,
mixer * _mixer );
Mixer* mixer );
virtual ~AudioSampleRecorder();
f_cnt_t framesRecorded() const;

2
include/AudioSdl.h
View File

@@ -40,7 +40,7 @@ class QLineEdit;
class AudioSdl : public AudioDevice
{
public:
AudioSdl( bool & _success_ful, mixer * _mixer );
AudioSdl( bool & _success_ful, Mixer* mixer );
virtual ~AudioSdl();
inline static QString name()

4
include/Controller.h
View File

@@ -28,7 +28,7 @@
#define _CONTROLLER_H
#include "engine.h"
#include "mixer.h"
#include "Mixer.h"
#include "Model.h"
#include "JournallingObject.h"
@@ -65,7 +65,7 @@ public:
inline bool isSampleExact() const
{
return m_sampleExact ||
engine::getMixer()->currentQualitySettings().
engine::mixer()->currentQualitySettings().
sampleExactControllers;
}

18
include/Effect.h
View File

@@ -28,7 +28,7 @@
#include "Plugin.h"
#include "engine.h"
#include "mixer.h"
#include "Mixer.h"
#include "AutomatableModel.h"
#include "TempoSyncKnobModel.h"
@@ -102,10 +102,10 @@ public:
inline f_cnt_t timeout() const
{
const float samples =
engine::getMixer()->processingSampleRate() *
engine::mixer()->processingSampleRate() *
m_autoQuitModel.value() / 1000.0f;
return 1 + ( static_cast<Uint32>( samples ) /
engine::getMixer()->framesPerPeriod() );
engine::mixer()->framesPerPeriod() );
}
inline float wetLevel() const
@@ -122,7 +122,7 @@ public:
{
const float level = m_gateModel.value();
return level*level * m_processors *
engine::getMixer()->framesPerPeriod();
engine::mixer()->framesPerPeriod();
}
inline f_cnt_t bufferCount() const
@@ -174,9 +174,9 @@ protected:
sample_rate_t _dst_sr )
{
resample( 0, _src_buf,
engine::getMixer()->processingSampleRate(),
engine::mixer()->processingSampleRate(),
_dst_buf, _dst_sr,
engine::getMixer()->framesPerPeriod() );
engine::mixer()->framesPerPeriod() );
}
inline void sampleBack( const sampleFrame * _src_buf,
@@ -184,9 +184,9 @@ protected:
sample_rate_t _src_sr )
{
resample( 1, _src_buf, _src_sr, _dst_buf,
engine::getMixer()->processingSampleRate(),
engine::getMixer()->framesPerPeriod() * _src_sr /
engine::getMixer()->processingSampleRate() );
engine::mixer()->processingSampleRate(),
engine::mixer()->framesPerPeriod() * _src_sr /
engine::mixer()->processingSampleRate() );
}
void reinitSRC();

2
include/EffectChain.h
View File

@@ -28,7 +28,7 @@
#include "Model.h"
#include "SerializingObject.h"
#include "mixer.h"
#include "Mixer.h"
#include "AutomatableModel.h"
class Effect;

4
include/FxMixer.h
View File

@@ -26,7 +26,7 @@
#define _FX_MIXER_H
#include "Model.h"
#include "mixer.h"
#include "Mixer.h"
#include "EffectChain.h"
#include "JournallingObject.h"
@@ -91,7 +91,7 @@ private:
FxChannel * m_fxChannels[NumFxChannels+1]; // +1 = master
friend class mixerWorkerThread;
friend class MixerWorkerThread;
friend class FxMixerView;
} ;

2
include/Instrument.h
View File

@@ -29,7 +29,7 @@
#include <QtGui/QWidget>
#include "Plugin.h"
#include "mixer.h"
#include "Mixer.h"
// forward-declarations

2
include/InstrumentSoundShaping.h
View File

@@ -25,7 +25,7 @@
#ifndef _INSTRUMENT_SOUND_SHAPING_H
#define _INSTRUMENT_SOUND_SHAPING_H
#include "mixer.h"
#include "Mixer.h"
#include "ComboBoxModel.h"

14
include/mixer.h → include/Mixer.h
View File

@@ -1,7 +1,7 @@
/*
* mixer.h - audio-device-independent mixer for LMMS
* Mixer.h - audio-device-independent mixer for LMMS
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -75,7 +75,7 @@ const Octaves BaseOctave = DefaultOctave;
class MixerWorkerThread;
class EXPORT mixer : public QObject
class EXPORT Mixer : public QObject
{
Q_OBJECT
public:
@@ -377,13 +377,13 @@ private:
class fifoWriter : public QThread
{
public:
fifoWriter( mixer * _mixer, fifo * _fifo );
fifoWriter( Mixer * _mixer, fifo * _fifo );
void finish();
private:
mixer * m_mixer;
Mixer * m_mixer;
fifo * m_fifo;
volatile bool m_writing;
@@ -392,8 +392,8 @@ private:
} ;
mixer();
virtual ~mixer();
Mixer();
virtual ~Mixer();
void startProcessing( bool _needs_fifo = true );
void stopProcessing();

6
include/ProjectRenderer.h
View File

@@ -65,7 +65,7 @@ public:
} ;
ProjectRenderer( const mixer::qualitySettings & _qs,
ProjectRenderer( const Mixer::qualitySettings & _qs,
const OutputSettings & _os,
ExportFileFormats _file_format,
const QString & _out_file );
@@ -95,8 +95,8 @@ private:
virtual void run();
AudioFileDevice * m_fileDev;
mixer::qualitySettings m_qualitySettings;
mixer::qualitySettings m_oldQualitySettings;
Mixer::qualitySettings m_qualitySettings;
Mixer::qualitySettings m_oldQualitySettings;
volatile int m_progress;
volatile bool m_abort;

2
include/basic_filters.h
View File

@@ -36,7 +36,7 @@
#include <math.h>
#include "lmms_basics.h"
#include "mixer.h"
#include "Mixer.h"
#include "templates.h"
#include "lmms_constants.h"

8
include/engine.h
View File

@@ -1,7 +1,7 @@
/*
* engine.h - engine-system of LMMS
*
* Copyright (c) 2006-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -40,7 +40,7 @@ class FxMixer;
class FxMixerView;
class ProjectJournal;
class MainWindow;
class mixer;
class Mixer;
class pianoRoll;
class projectNotes;
class song;
@@ -71,7 +71,7 @@ public:
}
// core
static mixer * getMixer()
static Mixer *mixer()
{
return s_mixer;
}
@@ -177,7 +177,7 @@ private:
static float s_framesPerTick;
// core
static mixer * s_mixer;
static Mixer *s_mixer;
static FxMixer * s_fxMixer;
static song * s_song;
static bbTrackContainer * s_bbTrackContainer;

4
include/note_play_handle.h
View File

@@ -28,7 +28,7 @@
#define _NOTE_PLAY_HANDLE_H
#include "lmmsconfig.h"
#include "mixer.h"
#include "Mixer.h"
#include "note.h"
#include "engine.h"
#include "track.h"
@@ -85,7 +85,7 @@ public:
inline fpp_t framesLeftForCurrentPeriod() const
{
return (fpp_t) qMin<f_cnt_t>( framesLeft(),
engine::getMixer()->framesPerPeriod() );
engine::mixer()->framesPerPeriod() );
}

2
include/pch.h
View File

@@ -31,6 +31,6 @@
#include <limits>
#include "mixer.h"
#include "Mixer.h"
#endif

2
include/sample_play_handle.h
View File

@@ -26,7 +26,7 @@
#ifndef _SAMPLE_PLAY_HANDLE_H
#define _SAMPLE_PLAY_HANDLE_H
#include "mixer.h"
#include "Mixer.h"
#include "sample_buffer.h"
#include "AutomatableModel.h"

2
include/sample_record_handle.h
View File

@@ -30,7 +30,7 @@
#include <QtCore/QPair>
#include <qobject.h>
#include "mixer.h"
#include "Mixer.h"
#include "sample_buffer.h"
class bbTrack;

2
include/surround_area.h
View File

@@ -31,7 +31,7 @@
#include <QtGui/QWidget>
#include "AutomatableModel.h"
#include "mixer.h"
#include "Mixer.h"
class QPixmap;

2
include/visualization_widget.h
View File

@@ -29,7 +29,7 @@
#include <QtGui/QWidget>
#include <QtGui/QPixmap>
#include "mixer.h"
#include "Mixer.h"
class visualizationWidget : public QWidget