diff --git a/src/basetrackplayer.cpp b/src/basetrackplayer.cpp index 8feaa8148f1..e54de2e35c6 100644 --- a/src/basetrackplayer.cpp +++ b/src/basetrackplayer.cpp @@ -41,15 +41,8 @@ BaseTrackPlayer::BaseTrackPlayer(QObject* pParent, // Set the routing option defaults for the master and headphone mixes. { - ControlObjectThreadMain* pMaster = new ControlObjectThreadMain( - getGroup(), "master"); - pMaster->slotSet(defaultMaster); - delete pMaster; - - ControlObjectThreadMain* pHeadphones = new ControlObjectThreadMain( - getGroup(), "pfl"); - pHeadphones->slotSet(defaultHeadphones); - delete pHeadphones; + ControlObject::set(ConfigKey(getGroup(), "master"), (double)defaultMaster); + ControlObject::set(ConfigKey(getGroup(), "pfl"), (double)defaultHeadphones); } // Connect our signals and slots with the EngineBuffer's signals and @@ -64,17 +57,11 @@ BaseTrackPlayer::BaseTrackPlayer(QObject* pParent, connect(pEngineBuffer, SIGNAL(trackUnloaded(TrackPointer)), this, SLOT(slotUnloadTrack(TrackPointer))); - //Get cue point control object - m_pCuePoint = new ControlObjectThreadMain( - getGroup(),"cue_point"); // Get loop point control objects - m_pLoopInPoint = new ControlObjectThreadMain( + m_pLoopInPoint = new ControlObjectThread( getGroup(),"loop_start_position"); - m_pLoopOutPoint = new ControlObjectThreadMain( + m_pLoopOutPoint = new ControlObjectThread( getGroup(),"loop_end_position"); - //Playback position within the currently loaded track (in this player). - m_pPlayPosition = new ControlObjectThreadMain( - getGroup(), "playposition"); // Duration of the current song, we create this one because nothing else does. m_pDuration = new ControlObject(ConfigKey(getGroup(), "duration")); @@ -91,9 +78,9 @@ BaseTrackPlayer::BaseTrackPlayer(QObject* pParent, m_pEndOfTrack->set(0.); //BPM of the current song - m_pBPM = new ControlObjectThreadMain(group, "file_bpm"); - m_pReplayGain = new ControlObjectThreadMain(group, "replaygain"); - m_pPlay = new ControlObjectThreadMain(group, "play"); + m_pBPM = new ControlObjectThread(group, "file_bpm"); + m_pReplayGain = new ControlObjectThread(group, "replaygain"); + m_pPlay = new ControlObjectThread(group, "play"); } BaseTrackPlayer::~BaseTrackPlayer() @@ -105,10 +92,8 @@ BaseTrackPlayer::~BaseTrackPlayer() delete m_pWaveformZoom; delete m_pEndOfTrack; - delete m_pCuePoint; delete m_pLoopInPoint; delete m_pLoopOutPoint; - delete m_pPlayPosition; delete m_pBPM; delete m_pReplayGain; delete m_pDuration; diff --git a/src/basetrackplayer.h b/src/basetrackplayer.h index 7514f02a79d..816ec6fac45 100644 --- a/src/basetrackplayer.h +++ b/src/basetrackplayer.h @@ -10,7 +10,7 @@ class EngineMaster; class ControlObject; class ControlPotmeter; -class ControlObjectThreadMain; +class ControlObjectThread; class AnalyserQueue; class BaseTrackPlayer : public BasePlayer { @@ -52,14 +52,12 @@ class BaseTrackPlayer : public BasePlayer { ControlPotmeter* m_pWaveformZoom; ControlObject* m_pEndOfTrack; - ControlObjectThreadMain* m_pCuePoint; - ControlObjectThreadMain* m_pLoopInPoint; - ControlObjectThreadMain* m_pLoopOutPoint; - ControlObjectThreadMain* m_pPlayPosition; + ControlObjectThread* m_pLoopInPoint; + ControlObjectThread* m_pLoopOutPoint; ControlObject* m_pDuration; - ControlObjectThreadMain* m_pBPM; - ControlObjectThreadMain* m_pReplayGain; - ControlObjectThreadMain* m_pPlay; + ControlObjectThread* m_pBPM; + ControlObjectThread* m_pReplayGain; + ControlObjectThread* m_pPlay; EngineDeck* m_pChannel; }; diff --git a/src/dlgautodj.cpp b/src/dlgautodj.cpp index 1db47a66f68..5ccd5c5e6e7 100644 --- a/src/dlgautodj.cpp +++ b/src/dlgautodj.cpp @@ -63,7 +63,7 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject* pConfig, m_pCOShufflePlaylist = new ControlPushButton( ConfigKey("[AutoDJ]", "shuffle_playlist")); - m_pCOTShufflePlaylist = new ControlObjectThreadMain(m_pCOShufflePlaylist->getKey()); + m_pCOTShufflePlaylist = new ControlObjectThread(m_pCOShufflePlaylist->getKey()); connect(m_pCOTShufflePlaylist, SIGNAL(valueChanged(double)), this, SLOT(shufflePlaylist(double))); connect(pushButtonShuffle, SIGNAL(clicked(bool)), @@ -71,7 +71,7 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject* pConfig, m_pCOSkipNext = new ControlPushButton( ConfigKey("[AutoDJ]", "skip_next")); - m_pCOTSkipNext = new ControlObjectThreadMain(m_pCOSkipNext->getKey()); + m_pCOTSkipNext = new ControlObjectThread(m_pCOSkipNext->getKey()); connect(m_pCOTSkipNext, SIGNAL(valueChanged(double)), this, SLOT(skipNext(double))); connect(pushButtonSkipNext, SIGNAL(clicked(bool)), @@ -87,7 +87,7 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject* pConfig, m_pCOFadeNow = new ControlPushButton( ConfigKey("[AutoDJ]", "fade_now")); - m_pCOTFadeNow = new ControlObjectThreadMain(m_pCOFadeNow->getKey()); + m_pCOTFadeNow = new ControlObjectThread(m_pCOFadeNow->getKey()); connect(m_pCOTFadeNow, SIGNAL(valueChanged(double)), this, SLOT(fadeNow(double))); connect(pushButtonFadeNow, SIGNAL(clicked(bool)), @@ -102,21 +102,21 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject* pConfig, m_pCOEnabledAutoDJ = new ControlPushButton( ConfigKey("[AutoDJ]", "enabled")); m_pCOEnabledAutoDJ->setButtonMode(ControlPushButton::TOGGLE); - m_pCOTEnabledAutoDJ = new ControlObjectThreadMain(m_pCOEnabledAutoDJ->getKey()); + m_pCOTEnabledAutoDJ = new ControlObjectThread(m_pCOEnabledAutoDJ->getKey()); connect(m_pCOTEnabledAutoDJ, SIGNAL(valueChanged(double)), this, SLOT(enableAutoDJCo(double))); // playposition is from -0.14 to + 1.14 - m_pCOPlayPos1 = new ControlObjectThreadMain("[Channel1]", "playposition"); - m_pCOPlayPos2 = new ControlObjectThreadMain("[Channel2]", "playposition"); - m_pCOPlay1 = new ControlObjectThreadMain("[Channel1]", "play"); - m_pCOPlay2 = new ControlObjectThreadMain("[Channel2]", "play"); - m_pCOPlay1Fb = new ControlObjectThreadMain("[Channel1]", "play"); - m_pCOPlay2Fb = new ControlObjectThreadMain("[Channel2]", "play"); - m_pCORepeat1 = new ControlObjectThreadMain("[Channel1]", "repeat"); - m_pCORepeat2 = new ControlObjectThreadMain("[Channel2]", "repeat"); - m_pCOCrossfader = new ControlObjectThreadMain("[Master]", "crossfader"); - m_pCOCrossfaderReverse = new ControlObjectThreadMain("[Mixer Profile]", "xFaderReverse"); + m_pCOPlayPos1 = new ControlObjectThread("[Channel1]", "playposition"); + m_pCOPlayPos2 = new ControlObjectThread("[Channel2]", "playposition"); + m_pCOPlay1 = new ControlObjectThread("[Channel1]", "play"); + m_pCOPlay2 = new ControlObjectThread("[Channel2]", "play"); + m_pCOPlay1Fb = new ControlObjectThread("[Channel1]", "play"); + m_pCOPlay2Fb = new ControlObjectThread("[Channel2]", "play"); + m_pCORepeat1 = new ControlObjectThread("[Channel1]", "repeat"); + m_pCORepeat2 = new ControlObjectThread("[Channel2]", "repeat"); + m_pCOCrossfader = new ControlObjectThread("[Master]", "crossfader"); + m_pCOCrossfaderReverse = new ControlObjectThread("[Mixer Profile]", "xFaderReverse"); QString str_autoDjTransition = m_pConfig->getValueString( ConfigKey(CONFIG_KEY, kTransitionPreferenceName)); diff --git a/src/dlgautodj.h b/src/dlgautodj.h index 8230c238e4f..b5e4c9138d8 100644 --- a/src/dlgautodj.h +++ b/src/dlgautodj.h @@ -16,6 +16,7 @@ class WTrackTableView; class AnalyserQueue; class QSqlTableModel; class ControlObjectThreadMain; +class ControlObjectThread; class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView { Q_OBJECT @@ -89,20 +90,20 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView { float m_fadeDuration1; float m_fadeDuration2; int m_backUpTransition; - ControlObjectThreadMain* m_pCOPlayPos1; - ControlObjectThreadMain* m_pCOPlayPos2; - ControlObjectThreadMain* m_pCOPlay1; - ControlObjectThreadMain* m_pCOPlay2; - ControlObjectThreadMain* m_pCOPlay1Fb; - ControlObjectThreadMain* m_pCOPlay2Fb; - ControlObjectThreadMain* m_pCORepeat1; - ControlObjectThreadMain* m_pCORepeat2; - ControlObjectThreadMain* m_pCOCrossfader; - ControlObjectThreadMain* m_pCOCrossfaderReverse; - ControlObjectThreadMain* m_pCOTSkipNext; - ControlObjectThreadMain* m_pCOTFadeNow; - ControlObjectThreadMain* m_pCOTShufflePlaylist; - ControlObjectThreadMain* m_pCOTEnabledAutoDJ; + ControlObjectThread* m_pCOPlayPos1; + ControlObjectThread* m_pCOPlayPos2; + ControlObjectThread* m_pCOPlay1; + ControlObjectThread* m_pCOPlay2; + ControlObjectThread* m_pCOPlay1Fb; + ControlObjectThread* m_pCOPlay2Fb; + ControlObjectThread* m_pCORepeat1; + ControlObjectThread* m_pCORepeat2; + ControlObjectThread* m_pCOCrossfader; + ControlObjectThread* m_pCOCrossfaderReverse; + ControlObjectThread* m_pCOTSkipNext; + ControlObjectThread* m_pCOTFadeNow; + ControlObjectThread* m_pCOTShufflePlaylist; + ControlObjectThread* m_pCOTEnabledAutoDJ; ControlPushButton* m_pCOSkipNext; ControlPushButton* m_pCOFadeNow; ControlPushButton* m_pCOShufflePlaylist; diff --git a/src/dlgprefcontrols.cpp b/src/dlgprefcontrols.cpp index 480c8cf69dc..a4bc2d84f5a 100644 --- a/src/dlgprefcontrols.cpp +++ b/src/dlgprefcontrols.cpp @@ -53,25 +53,25 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxApp * mixxx, for (unsigned int i = 0; i < m_pPlayerManager->numDecks(); ++i) { QString group = PlayerManager::groupForDeck(i); - m_rateControls.push_back(new ControlObjectThreadMain( + m_rateControls.push_back(new ControlObjectThread( group, "rate")); - m_rateRangeControls.push_back(new ControlObjectThreadMain( + m_rateRangeControls.push_back(new ControlObjectThread( group, "rateRange")); - m_rateDirControls.push_back(new ControlObjectThreadMain( + m_rateDirControls.push_back(new ControlObjectThread( group, "rate_dir")); - m_cueControls.push_back(new ControlObjectThreadMain( + m_cueControls.push_back(new ControlObjectThread( group, "cue_mode")); } for (unsigned int i = 0; i < m_pPlayerManager->numSamplers(); ++i) { QString group = PlayerManager::groupForSampler(i); - m_rateControls.push_back(new ControlObjectThreadMain( + m_rateControls.push_back(new ControlObjectThread( group, "rate")); - m_rateRangeControls.push_back(new ControlObjectThreadMain( + m_rateRangeControls.push_back(new ControlObjectThread( group, "rateRange")); - m_rateDirControls.push_back(new ControlObjectThreadMain( + m_rateDirControls.push_back(new ControlObjectThread( group, "rate_dir")); - m_cueControls.push_back(new ControlObjectThreadMain( + m_cueControls.push_back(new ControlObjectThread( group, "cue_mode")); } @@ -327,17 +327,17 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxApp * mixxx, DlgPrefControls::~DlgPrefControls() { delete m_pControlPositionDisplay; - - foreach (ControlObjectThreadMain* pControl, m_rateControls) { + + foreach (ControlObjectThread* pControl, m_rateControls) { delete pControl; } - foreach (ControlObjectThreadMain* pControl, m_rateDirControls) { + foreach (ControlObjectThread* pControl, m_rateDirControls) { delete pControl; } - foreach (ControlObjectThreadMain* pControl, m_cueControls) { + foreach (ControlObjectThread* pControl, m_cueControls) { delete pControl; } - foreach (ControlObjectThreadMain* pControl, m_rateRangeControls) { + foreach (ControlObjectThread* pControl, m_rateRangeControls) { delete pControl; } } @@ -417,12 +417,12 @@ void DlgPrefControls::slotSetRateRange(int pos) range = 0.08f; // Set rate range for every group - foreach (ControlObjectThreadMain* pControl, m_rateRangeControls) { + foreach (ControlObjectThread* pControl, m_rateRangeControls) { pControl->slotSet(range); } // Reset rate for every group - foreach (ControlObjectThreadMain* pControl, m_rateControls) { + foreach (ControlObjectThread* pControl, m_rateControls) { pControl->slotSet(0); } } @@ -434,7 +434,7 @@ void DlgPrefControls::slotSetRateDir(int index) dir = -1.; // Set rate direction for every group - foreach (ControlObjectThreadMain* pControl, m_rateDirControls) { + foreach (ControlObjectThread* pControl, m_rateDirControls) { pControl->slotSet(dir); } } @@ -450,7 +450,7 @@ void DlgPrefControls::slotSetCueDefault(int) m_pConfig->set(ConfigKey("[Controls]","CueDefault"), ConfigValue(cueIndex)); // Set cue behavior for every group - foreach (ControlObjectThreadMain* pControl, m_cueControls) { + foreach (ControlObjectThread* pControl, m_cueControls) { pControl->slotSet(cueIndex); } } @@ -757,4 +757,4 @@ bool DlgPrefControls::checkSkinResolution(QString skin) QString skinHeight = res.right(res.count()-skinWidth.count()-1); return !(skinWidth.toInt() > screenWidth || skinHeight.toInt() > screenHeight); -} +} \ No newline at end of file diff --git a/src/dlgprefcontrols.h b/src/dlgprefcontrols.h index 5005b766650..3af15481583 100644 --- a/src/dlgprefcontrols.h +++ b/src/dlgprefcontrols.h @@ -22,7 +22,7 @@ #include "configobject.h" class QWidget; -class ControlObjectThreadMain; +class ControlObjectThread; class ControlPotmeter; class SkinLoader; class PlayerManager; @@ -94,10 +94,10 @@ public slots: ConfigObject *m_pConfig; int m_timer; ControlObject* m_pControlPositionDisplay; - QList m_cueControls; - QList m_rateControls; - QList m_rateDirControls; - QList m_rateRangeControls; + QList m_cueControls; + QList m_rateControls; + QList m_rateDirControls; + QList m_rateRangeControls; PlayerManager* m_pPlayerManager; MixxxApp *m_mixxx; SkinLoader* m_pSkinLoader; diff --git a/src/dlgprefrecord.cpp b/src/dlgprefrecord.cpp index 51c43037854..17eaecd631e 100644 --- a/src/dlgprefrecord.cpp +++ b/src/dlgprefrecord.cpp @@ -37,7 +37,8 @@ DlgPrefRecord::DlgPrefRecord(QWidget* parent, ConfigObject* pConfig setupUi(this); // See RECORD_* #defines in defs_recording.h - m_pRecordControl = new ControlObjectThreadMain(RECORDING_PREF_KEY, "status"); + m_pRecordControl = new ControlObjectThread( + RECORDING_PREF_KEY, "status"); m_pRadioOgg = new QRadioButton("Ogg Vorbis"); m_pRadioMp3 = new QRadioButton(ENCODING_MP3); @@ -267,4 +268,4 @@ void DlgPrefRecord::slotChangeSplitSize() { m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "FileSize"), ConfigValue(comboBoxSplitting->currentText())); -} +} \ No newline at end of file diff --git a/src/dlgprefrecord.h b/src/dlgprefrecord.h index b08b39bbc51..eed9ea57582 100644 --- a/src/dlgprefrecord.h +++ b/src/dlgprefrecord.h @@ -23,24 +23,18 @@ #include "ui_dlgprefrecorddlg.h" #include "configobject.h" - class ControlObject; -class ControlObjectThreadMain; - - +class ControlObjectThread; class QWidget; -/** - *@author John Sully - */ class DlgPrefRecord : public QWidget, public Ui::DlgPrefRecordDlg { Q_OBJECT -public: + public: DlgPrefRecord(QWidget *parent, ConfigObject *_config); ~DlgPrefRecord(); -public slots: - /** Apply changes to widget */ + public slots: + // Apply changes to widget void slotApply(); void slotUpdate(); void slotEncoding(); @@ -48,20 +42,20 @@ public slots: void slotRecordPathChange(); void slotEnableCueFile(int); void slotChangeSplitSize(); - /** Dialog to browse for recordings directory */ + // Dialog to browse for recordings directory void slotBrowseRecordingsDir(); -signals: + signals: void apply(const QString &); -private: + private: void setRecordingFolder(); void setMetaData(); void loadMetaData(); int getSliderQualityVal(); void updateTextQuality(); - /** Pointer to config object */ + // Pointer to config object ConfigObject* m_pConfig; - ControlObjectThreadMain* m_pRecordControl; + ControlObjectThread* m_pRecordControl; bool m_bConfirmOverwrite; QString fileTypeExtension; QRadioButton* m_pRadioOgg; diff --git a/src/dlgprefshoutcast.cpp b/src/dlgprefshoutcast.cpp index fe96baef921..7e54ae96e5c 100644 --- a/src/dlgprefshoutcast.cpp +++ b/src/dlgprefshoutcast.cpp @@ -32,7 +32,7 @@ DlgPrefShoutcast::DlgPrefShoutcast(QWidget *parent, ConfigObject *_ QString tmp_string; setupUi(this); - m_pUpdateShoutcastFromPrefs = new ControlObjectThreadMain( + m_pUpdateShoutcastFromPrefs = new ControlObjectThread( SHOUTCAST_PREF_KEY, "update_from_prefs"); // Enable live broadcasting checkbox diff --git a/src/dlgprefshoutcast.h b/src/dlgprefshoutcast.h index 16c5e28e2ab..6ec506fd4c2 100644 --- a/src/dlgprefshoutcast.h +++ b/src/dlgprefshoutcast.h @@ -46,7 +46,7 @@ public slots: private: /** Pointer to config object */ ConfigObject *m_pConfig; - ControlObjectThreadMain* m_pUpdateShoutcastFromPrefs; //If set to 1, EngineShoutcast will update it's settings. + ControlObjectThread* m_pUpdateShoutcastFromPrefs; //If set to 1, EngineShoutcast will update it's settings. }; diff --git a/src/dlgprefsound.cpp b/src/dlgprefsound.cpp index 577e6e35a51..d4a962cedb3 100644 --- a/src/dlgprefsound.cpp +++ b/src/dlgprefsound.cpp @@ -93,12 +93,12 @@ DlgPrefSound::DlgPrefSound(QWidget *pParent, SoundManager *pSoundManager, this, SLOT(loadSettings())); m_pMasterUnderflowCount = - new ControlObjectThreadMain("[Master]", "underflow_count"); + new ControlObjectThread("[Master]", "underflow_count"); connect(m_pMasterUnderflowCount, SIGNAL(valueChanged(double)), this, SLOT(bufferUnderflow(double))); m_pMasterLatency = - new ControlObjectThreadMain("[Master]", "latency"); + new ControlObjectThread("[Master]", "latency"); connect(m_pMasterLatency, SIGNAL(valueChanged(double)), this, SLOT(masterLatencyChanged(double))); diff --git a/src/dlgprefsound.h b/src/dlgprefsound.h index 00bd3521571..e00a5fa7404 100644 --- a/src/dlgprefsound.h +++ b/src/dlgprefsound.h @@ -26,7 +26,7 @@ class PlayerManager; class ControlObject; class SoundDevice; class DlgPrefSoundItem; -class ControlObjectThreadMain; +class ControlObjectThread; /* * TODO(bkgood) (n-decks) establish a signal/slot connection with a signal @@ -65,8 +65,8 @@ public slots: SoundManager *m_pSoundManager; PlayerManager *m_pPlayerManager; ConfigObject *m_pConfig; - ControlObjectThreadMain* m_pMasterUnderflowCount; - ControlObjectThreadMain* m_pMasterLatency; + ControlObjectThread* m_pMasterUnderflowCount; + ControlObjectThread* m_pMasterLatency; QList m_inputDevices; QList m_outputDevices; bool m_settingsModified; diff --git a/src/dlgprefvinyl.h b/src/dlgprefvinyl.h index 26a2c4426e5..ba72147f9fd 100644 --- a/src/dlgprefvinyl.h +++ b/src/dlgprefvinyl.h @@ -59,9 +59,9 @@ public slots: //PlayerProxy *player; VinylControlManager* m_pVCManager; /** Pointer to config object */ - ConfigObject *config; - ControlObjectThreadMain m_COSpeed1; - ControlObjectThreadMain m_COSpeed2; + ConfigObject* config; + ControlObjectThread m_COSpeed1; + ControlObjectThread m_COSpeed2; }; #endif diff --git a/src/ladspa/ladspainstance.cpp b/src/ladspa/ladspainstance.cpp index ed51f07b6c2..39d82c75ce0 100644 --- a/src/ladspa/ladspainstance.cpp +++ b/src/ladspa/ladspainstance.cpp @@ -11,19 +11,16 @@ #include "ladspainstance.h" #include "controlpushbutton.h" -ControlObjectThreadMain *LADSPAInstance::m_pControlObjectSampleRate = NULL; +ControlObjectThread* LADSPAInstance::m_pControlObjectSampleRate = NULL; -LADSPAInstance::LADSPAInstance(const LADSPA_Descriptor * descriptor, int slot) -{ +LADSPAInstance::LADSPAInstance(const LADSPA_Descriptor* descriptor, int slot) { m_pDescriptor = descriptor; - if (m_pControlObjectSampleRate == NULL) - { - m_pControlObjectSampleRate = new ControlObjectThreadMain("[Master]", "samplerate"); + if (m_pControlObjectSampleRate == NULL) { + m_pControlObjectSampleRate = new ControlObjectThread("[Master]", "samplerate"); } - if (LADSPA_IS_INPLACE_BROKEN(m_pDescriptor->Properties)) - { + if (LADSPA_IS_INPLACE_BROKEN(m_pDescriptor->Properties)) { qDebug() << "LADSPA: Inplace broken!"; } @@ -31,38 +28,32 @@ LADSPAInstance::LADSPAInstance(const LADSPA_Descriptor * descriptor, int slot) QString slotString; slotString.setNum(slot); - ConfigKey * key = new ConfigKey("[LADSPA]", "EnableEffect" + slotString); + ConfigKey* key = new ConfigKey("[LADSPA]", "EnableEffect" + slotString); m_pControlObjectEnable = ControlObject::getControl(*key); key = new ConfigKey("[LADSPA]", "DryWet" + slotString); m_pControlObjectDryWet = ControlObject::getControl(*key); } -const LADSPA_Descriptor * LADSPAInstance::getDescriptor() -{ +const LADSPA_Descriptor* LADSPAInstance::getDescriptor() { return m_pDescriptor; } -int LADSPAInstance::getSampleRate() -{ +int LADSPAInstance::getSampleRate() { return (int)m_pControlObjectSampleRate->get(); } -LADSPAInstance::~LADSPAInstance() -{ +LADSPAInstance::~LADSPAInstance() { } -bool LADSPAInstance::isInplaceBroken() -{ +bool LADSPAInstance::isInplaceBroken() { return LADSPA_IS_INPLACE_BROKEN(getDescriptor()->Properties); } -bool LADSPAInstance::isEnabled() -{ +bool LADSPAInstance::isEnabled() { // qDebug() << "isEnabled() == " << m_pControlObjectEnable->get(); return m_pControlObjectEnable->get() > 0.0; } -float LADSPAInstance::getWet() -{ +float LADSPAInstance::getWet() { return m_pControlObjectDryWet->get(); } diff --git a/src/ladspa/ladspainstance.h b/src/ladspa/ladspainstance.h index b074c2eec54..e8bc8873cdb 100644 --- a/src/ladspa/ladspainstance.h +++ b/src/ladspa/ladspainstance.h @@ -38,7 +38,7 @@ class LADSPAInstance private: const LADSPA_Descriptor * m_pDescriptor; - static ControlObjectThreadMain *m_pControlObjectSampleRate; + static ControlObjectThread *m_pControlObjectSampleRate; ControlObject *m_pControlObjectEnable; ControlObject *m_pControlObjectDryWet; }; diff --git a/src/ladspa/ladspapresetinstance.cpp b/src/ladspa/ladspapresetinstance.cpp index f4037d6569d..02db612c906 100644 --- a/src/ladspa/ladspapresetinstance.cpp +++ b/src/ladspa/ladspapresetinstance.cpp @@ -50,14 +50,14 @@ void LADSPAPresetInstance::addPlugin(int i, LADSPAPlugin * plugin, EngineLADSPA void LADSPAPresetInstance::addControl(int i, LADSPAPresetKnob * knob, EngineLADSPA * engine) { - ConfigKey * key = new ConfigKey("[LADSPA]", knob->getLabel()); - ControlObject * potmeter = new ControlPotmeter(*key, knob->getMin(), knob->getMax()); - ControlObjectThreadMain * potmeterThreadMain = new ControlObjectThreadMain(potmeter->getKey()); - LADSPAControl * control = new LADSPAControl; + ConfigKey* key = new ConfigKey("[LADSPA]", knob->getLabel()); + ControlObject* potmeter = new ControlPotmeter(*key, knob->getMin(), knob->getMax()); + ControlObjectThread potmeterThread(potmeter->getKey()); + LADSPAControl* control = new LADSPAControl; control->setValue(knob->getDefault()); - potmeterThreadMain->slotSet(knob->getDefault()); + potmeterThread.slotSet(knob->getDefault()); m_Keys[i] = key; - LADSPAPortConnectionVector * portConnections = knob->getConnections(); + LADSPAPortConnectionVector* portConnections = knob->getConnections(); for (LADSPAPortConnectionVector::iterator connection = portConnections->begin(); connection != portConnections->end(); connection++) { m_Instances[(*connection).plugin]->connect((*connection).port, control->getBuffer()); diff --git a/src/library/previewbuttondelegate.cpp b/src/library/previewbuttondelegate.cpp index 318501a5894..5865b5a958e 100644 --- a/src/library/previewbuttondelegate.cpp +++ b/src/library/previewbuttondelegate.cpp @@ -15,7 +15,7 @@ PreviewButtonDelegate::PreviewButtonDelegate(QObject *parent, int column) m_pButton(NULL), m_isOneCellInEditMode(false), m_column(column) { - m_pPreviewDeckPlay = new ControlObjectThreadMain( + m_pPreviewDeckPlay = new ControlObjectThread( PlayerManager::groupForPreviewDeck(0), "play"); connect(m_pPreviewDeckPlay, SIGNAL(valueChanged(double)), this, SLOT(previewDeckPlayChanged(double))); diff --git a/src/library/previewbuttondelegate.h b/src/library/previewbuttondelegate.h index a40a691cc68..d9b3f7d2105 100644 --- a/src/library/previewbuttondelegate.h +++ b/src/library/previewbuttondelegate.h @@ -7,7 +7,7 @@ #include "trackinfoobject.h" -class ControlObjectThreadMain; +class ControlObjectThread; class PreviewButtonDelegate : public QStyledItemDelegate { Q_OBJECT @@ -41,7 +41,7 @@ class PreviewButtonDelegate : public QStyledItemDelegate { private: QTableView* m_pTableView; - ControlObjectThreadMain* m_pPreviewDeckPlay; + ControlObjectThread* m_pPreviewDeckPlay; QPushButton* m_pButton; bool m_isOneCellInEditMode; QPersistentModelIndex m_currentEditedCellIndex; diff --git a/src/mixxx.cpp b/src/mixxx.cpp index f135cdc8011..29a390b5061 100644 --- a/src/mixxx.cpp +++ b/src/mixxx.cpp @@ -822,7 +822,7 @@ QString buildWhatsThis(const QString& title, const QString& text) { return QString("%1\n\n%2").arg(preparedTitle.replace("&", ""), text); } -/** initializes all QActions of the application */ +// initializes all QActions of the application void MixxxApp::initActions() { QString loadTrackText = tr("Load Track to Deck %1"); @@ -981,7 +981,7 @@ void MixxxApp::initActions() m_pOptionsVinylControl->setWhatsThis(buildWhatsThis(vinylControlTitle1, vinylControlText)); connect(m_pOptionsVinylControl, SIGNAL(toggled(bool)), this, SLOT(slotCheckboxVinylControl(bool))); - ControlObjectThreadMain* enabled1 = new ControlObjectThreadMain( + ControlObjectThread* enabled1 = new ControlObjectThread( "[Channel1]", "vinylcontrol_enabled", this); connect(enabled1, SIGNAL(valueChanged(double)), this, SLOT(slotControlVinylControl(double))); @@ -996,7 +996,7 @@ void MixxxApp::initActions() connect(m_pOptionsVinylControl2, SIGNAL(toggled(bool)), this, SLOT(slotCheckboxVinylControl2(bool))); - ControlObjectThreadMain* enabled2 = new ControlObjectThreadMain( + ControlObjectThread* enabled2 = new ControlObjectThread( "[Channel2]", "vinylcontrol_enabled", this); connect(enabled2, SIGNAL(valueChanged(double)), this, SLOT(slotControlVinylControl2(double))); diff --git a/src/skin/legacyskinparser.cpp b/src/skin/legacyskinparser.cpp index 63698210b88..409eaabb8ef 100644 --- a/src/skin/legacyskinparser.cpp +++ b/src/skin/legacyskinparser.cpp @@ -268,8 +268,8 @@ QWidget* LegacySkinParser::parseSkin(QString skinPath, QWidget* pParent) { bool ok = false; double value = QString::fromStdString(attribute.value()).toDouble(&ok); if (ok) { - ControlObjectThreadMain mainControl(configKey); - mainControl.slotSet(value); + ControlObjectThread cot(configKey); + cot.slotSet(value); } } diff --git a/src/skin/propertybinder.cpp b/src/skin/propertybinder.cpp index 36dac1912cc..27bd5db3634 100644 --- a/src/skin/propertybinder.cpp +++ b/src/skin/propertybinder.cpp @@ -9,22 +9,22 @@ PropertyBinder::PropertyBinder(QWidget* pWidget, QString propertyName, : QObject(pWidget), m_propertyName(propertyName), m_pWidget(pWidget), - m_pControlThreadMain(new ControlObjectThreadMain(pControl->getKey())), + m_pControlThread(new ControlObjectThread(pControl->getKey())), m_pConfig(pConfig) { - connect(m_pControlThreadMain, SIGNAL(valueChanged(double)), + connect(m_pControlThread, SIGNAL(valueChanged(double)), this, SLOT(slotValueChanged(double))); bool ok; double dValue = m_pConfig->getValueString(pControl->getKey()).toDouble(&ok); if (ok) { pControl->set(dValue); } else { - dValue = m_pControlThreadMain->get(); + dValue = m_pControlThread->get(); } slotValueChanged(dValue); } PropertyBinder::~PropertyBinder() { - delete m_pControlThreadMain; + delete m_pControlThread; } void PropertyBinder::slotValueChanged(double dValue) { @@ -34,5 +34,5 @@ void PropertyBinder::slotValueChanged(double dValue) { if (!m_pWidget->setProperty(propertyAscii.constData(), value)) { qDebug() << "Setting property" << m_propertyName << "to widget failed. Value:" << value; } - m_pConfig->set(m_pControlThreadMain->getKey(), QString::number(dValue)); + m_pConfig->set(m_pControlThread->getKey(), QString::number(dValue)); } diff --git a/src/skin/propertybinder.h b/src/skin/propertybinder.h index c2821f8b7b3..81e6e25ab19 100644 --- a/src/skin/propertybinder.h +++ b/src/skin/propertybinder.h @@ -9,7 +9,7 @@ #include "configobject.h" class ControlObject; -class ControlObjectThreadMain; +class ControlObjectThread; class PropertyBinder : public QObject { Q_OBJECT @@ -22,7 +22,7 @@ class PropertyBinder : public QObject { private: QString m_propertyName; QWidget* m_pWidget; - ControlObjectThreadMain* m_pControlThreadMain; + ControlObjectThread* m_pControlThread; ConfigObject* m_pConfig; }; diff --git a/src/sounddeviceportaudio.cpp b/src/sounddeviceportaudio.cpp index fcb925cfe53..df9ef10f8f7 100644 --- a/src/sounddeviceportaudio.cpp +++ b/src/sounddeviceportaudio.cpp @@ -190,24 +190,9 @@ int SoundDevicePortAudio::open() { // Update the samplerate and latency ControlObjects, which allow the // waveform view to properly correct for the latency. - - ControlObjectThreadMain* pControlObjectSampleRate = - new ControlObjectThreadMain("[Master]","samplerate"); - ControlObjectThreadMain* pControlObjectLatency = - new ControlObjectThreadMain("[Master]","latency"); - ControlObjectThreadMain* pControlObjectAudioBufferSize = - new ControlObjectThreadMain("[Master]","audio_buffer_size"); - - pControlObjectLatency->slotSet(currentLatencyMSec); - pControlObjectSampleRate->slotSet(m_dSampleRate); - pControlObjectAudioBufferSize->slotSet(bufferMSec); - - //qDebug() << "SampleRate" << pControlObjectSampleRate->get(); - //qDebug() << "Latency" << pControlObjectLatency->get(); - - delete pControlObjectLatency; - delete pControlObjectSampleRate; - delete pControlObjectAudioBufferSize; + ControlObject::set(ConfigKey("[Master]", "latency"), currentLatencyMSec); + ControlObject::set(ConfigKey("[Master]", "samplerate"), m_dSampleRate); + ControlObject::set(ConfigKey("[Master]", "audio_buffer_size"), bufferMSec); if (m_pMasterUnderflowCount) { m_pMasterUnderflowCount->set(0); diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 3f1a9f1ed4b..0dbaea07a95 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -54,7 +54,6 @@ SoundManager::SoundManager(ConfigObject *pConfig, m_pControlObjectSoundStatusCO = new ControlObject(ConfigKey("[SoundManager]", "status")); m_pControlObjectSoundStatusCO->set(SOUNDMANAGER_DISCONNECTED); m_pControlObjectVinylControlGainCO = new ControlObject(ConfigKey(VINYL_PREF_KEY, "gain")); - m_pControlObjectVinylControlGain = new ControlObjectThreadMain(m_pControlObjectVinylControlGainCO->getKey()); //Hack because PortAudio samplerate enumeration is slow as hell on Linux (ALSA dmix sucks, so we can't blame PortAudio) m_samplerates.push_back(44100); @@ -85,7 +84,6 @@ SoundManager::~SoundManager() { // by clearDeviceList -- bkgood delete m_pControlObjectSoundStatusCO; - delete m_pControlObjectVinylControlGain; delete m_pControlObjectVinylControlGainCO; } diff --git a/src/soundmanager.h b/src/soundmanager.h index 4b0f37564ee..889d41e6bb7 100644 --- a/src/soundmanager.h +++ b/src/soundmanager.h @@ -128,7 +128,6 @@ class SoundManager : public QObject { QHash m_registeredSources; QHash m_registeredDestinations; ControlObject* m_pControlObjectSoundStatusCO; - ControlObjectThreadMain* m_pControlObjectVinylControlGain; ControlObject* m_pControlObjectVinylControlGainCO; }; diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp index d4f2874aa2b..1a178e3b3c5 100644 --- a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp +++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp @@ -69,12 +69,12 @@ void GLWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev // Per-band gain from the EQ knobs. float lowGain(1.0), midGain(1.0), highGain(1.0); - if (m_lowFilterControlObject && - m_midFilterControlObject && - m_highFilterControlObject) { - lowGain = m_lowFilterControlObject->get(); - midGain = m_midFilterControlObject->get(); - highGain = m_highFilterControlObject->get(); + if (m_pLowFilterControlObject && + m_pMidFilterControlObject && + m_pHighFilterControlObject) { + lowGain = m_pLowFilterControlObject->get(); + midGain = m_pMidFilterControlObject->get(); + highGain = m_pHighFilterControlObject->get(); } WaveformWidgetFactory* factory = WaveformWidgetFactory::instance(); @@ -87,15 +87,15 @@ void GLWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev float maxMid[2]; float maxHigh[2]; - if (m_lowKillControlObject && m_lowKillControlObject->get() == 1.0) { + if (m_pLowKillControlObject && m_pLowKillControlObject->get() == 1.0) { lowGain = 0; } - if (m_midKillControlObject && m_midKillControlObject->get() == 1.0) { + if (m_pMidKillControlObject && m_pMidKillControlObject->get() == 1.0) { midGain = 0; } - if (m_highKillControlObject && m_highKillControlObject->get() == 1.0) { + if (m_pHighKillControlObject && m_pHighKillControlObject->get() == 1.0) { highGain = 0; } diff --git a/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp index 8b775964065..6f3f40b4887 100644 --- a/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp +++ b/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp @@ -134,12 +134,12 @@ int QtWaveformRendererFilteredSignal::buildPolygon() { // Per-band gain from the EQ knobs. float lowGain(1.0), midGain(1.0), highGain(1.0); - if (m_lowFilterControlObject && - m_midFilterControlObject && - m_highFilterControlObject) { - lowGain = m_lowFilterControlObject->get(); - midGain = m_midFilterControlObject->get(); - highGain = m_highFilterControlObject->get(); + if (m_pLowFilterControlObject && + m_pMidFilterControlObject && + m_pHighFilterControlObject) { + lowGain = m_pLowFilterControlObject->get(); + midGain = m_pMidFilterControlObject->get(); + highGain = m_pHighFilterControlObject->get(); } //apply separate visual gain @@ -312,7 +312,7 @@ void QtWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev int numberOfPoints = buildPolygon(); - if (m_lowKillControlObject && m_lowKillControlObject->get() > 0.1) { + if (m_pLowKillControlObject && m_pLowKillControlObject->get() > 0.1) { painter->setPen(QPen(m_lowKilledBrush, 0.0)); painter->setBrush(QColor(150,150,150,20)); } else { @@ -321,7 +321,7 @@ void QtWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev } painter->drawPolygon(&m_polygon[0][0],numberOfPoints); - if (m_midKillControlObject && m_midKillControlObject->get() > 0.1) { + if (m_pMidKillControlObject && m_pMidKillControlObject->get() > 0.1) { painter->setPen(QPen(m_midKilledBrush, 0.0)); painter->setBrush(QColor(150,150,150,20)); } else { @@ -330,7 +330,7 @@ void QtWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev } painter->drawPolygon(&m_polygon[1][0],numberOfPoints); - if (m_highKillControlObject && m_highKillControlObject->get() > 0.1) { + if (m_pHighKillControlObject && m_pHighKillControlObject->get() > 0.1) { painter->setPen(QPen(m_highKilledBrush, 0.0)); painter->setBrush(QColor(150,150,150,20)); } else { diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp index 62e6600e384..2596b06f0f6 100644 --- a/src/waveform/renderers/waveformmark.cpp +++ b/src/waveform/renderers/waveformmark.cpp @@ -14,7 +14,7 @@ WaveformMark::WaveformMark() void WaveformMark::setup(const QString& group, const QDomNode& node, const WaveformSignalColors& signalColors) { QString item = XmlParse::selectNodeQString(node, "Control"); - m_pointControl = new ControlObjectThreadMain(group, item); + m_pointControl = new ControlObjectThread(group, item); m_color = XmlParse::selectNodeQString(node, "Color"); if (m_color == "") { diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h index 9314003f183..6c5cd20d300 100644 --- a/src/waveform/renderers/waveformmark.h +++ b/src/waveform/renderers/waveformmark.h @@ -5,7 +5,7 @@ #include #include -class ControlObjectThreadMain; +class ControlObjectThread; class QDomNode; class WaveformSignalColors; @@ -16,7 +16,7 @@ class WaveformMark { const WaveformSignalColors& signalColors); private: - ControlObjectThreadMain* m_pointControl; + ControlObjectThread* m_pointControl; QColor m_color; QColor m_textColor; diff --git a/src/waveform/renderers/waveformmarkrange.cpp b/src/waveform/renderers/waveformmarkrange.cpp index 66c7c92bc54..374edb00b70 100644 --- a/src/waveform/renderers/waveformmarkrange.cpp +++ b/src/waveform/renderers/waveformmarkrange.cpp @@ -9,13 +9,6 @@ #include "xmlparse.h" #include "widget/wskincolor.h" -ControlObjectThreadMain* maybeMakeControl(ControlObject* pControl) { - if (pControl) { - return new ControlObjectThreadMain(pControl->getKey()); - } - return NULL; -} - WaveformMarkRange::WaveformMarkRange() : m_markStartPointControl(NULL), m_markEndPointControl(NULL), @@ -30,16 +23,24 @@ bool WaveformMarkRange::active() { bool WaveformMarkRange::enabled() { // Default to enabled if there is no enabled control. - return m_markEnabledControl == NULL || + return !m_markEnabledControl || !m_markEnabledControl->valid() || m_markEnabledControl->get() > 0.0; } double WaveformMarkRange::start() { - return m_markStartPointControl ? m_markStartPointControl->get() : -1.0; + double start = -1.0; + if (m_markStartPointControl && m_markStartPointControl->valid()) { + start = m_markStartPointControl->get(); + } + return start; } double WaveformMarkRange::end() { - return m_markEndPointControl ? m_markEndPointControl->get() : -1.0; + double end = -1.0; + if (m_markEndPointControl && m_markEndPointControl->valid()) { + end = m_markEndPointControl->get(); + } + return end; } void WaveformMarkRange::setup(const QString& group, const QDomNode& node, @@ -62,12 +63,12 @@ void WaveformMarkRange::setup(const QString& group, const QDomNode& node, qDebug() << "Didn't get mark TextColor, using parent's :" << m_disabledColor; } - m_markStartPointControl = maybeMakeControl(ControlObject::getControl( - ConfigKey(group, XmlParse::selectNodeQString(node, "StartControl")))); - m_markEndPointControl = maybeMakeControl(ControlObject::getControl( - ConfigKey(group, XmlParse::selectNodeQString(node, "EndControl")))); - m_markEnabledControl = maybeMakeControl(ControlObject::getControl( - ConfigKey(group, XmlParse::selectNodeQString(node, "EnabledControl")))); + m_markStartPointControl = new ControlObjectThread( + group, XmlParse::selectNodeQString(node, "StartControl")); + m_markEndPointControl = new ControlObjectThread( + group, XmlParse::selectNodeQString(node, "EndControl")); + m_markEnabledControl = new ControlObjectThread( + group, XmlParse::selectNodeQString(node, "EnabledControl")); } void WaveformMarkRange::generateImage(int weidth, int height) { diff --git a/src/waveform/renderers/waveformmarkrange.h b/src/waveform/renderers/waveformmarkrange.h index 75bf3a37270..5cf339355fe 100644 --- a/src/waveform/renderers/waveformmarkrange.h +++ b/src/waveform/renderers/waveformmarkrange.h @@ -3,7 +3,7 @@ #include -class ControlObjectThreadMain; +class ControlObjectThread; class QDomNode; class WaveformSignalColors; @@ -28,9 +28,9 @@ class WaveformMarkRange { private: void generateImage(int weidth, int height); - ControlObjectThreadMain* m_markStartPointControl; - ControlObjectThreadMain* m_markEndPointControl; - ControlObjectThreadMain* m_markEnabledControl; + ControlObjectThread* m_markStartPointControl; + ControlObjectThread* m_markEndPointControl; + ControlObjectThread* m_markEnabledControl; QColor m_activeColor; QColor m_disabledColor; diff --git a/src/waveform/renderers/waveformmarkset.cpp b/src/waveform/renderers/waveformmarkset.cpp index 05644ed5c7a..9d2d2fd5b36 100644 --- a/src/waveform/renderers/waveformmarkset.cpp +++ b/src/waveform/renderers/waveformmarkset.cpp @@ -61,7 +61,7 @@ void WaveformMarkSet::setup(const QString& group, const QDomNode& node, //qDebug() << "WaveformRenderMark::setup - Automatic mark" << hotCueControlItem; m_marks.push_back(m_defaultMark); WaveformMark& mark = m_marks.back(); - mark.m_pointControl = new ControlObjectThreadMain(pHotcue->getKey()); + mark.m_pointControl = new ControlObjectThread(pHotcue->getKey()); mark.m_text = mark.m_text.arg(i); } } diff --git a/src/waveform/renderers/waveformrenderbeat.cpp b/src/waveform/renderers/waveformrenderbeat.cpp index a57c7ed4f3c..e2a346fdeac 100644 --- a/src/waveform/renderers/waveformrenderbeat.cpp +++ b/src/waveform/renderers/waveformrenderbeat.cpp @@ -14,18 +14,18 @@ WaveformRenderBeat::WaveformRenderBeat(WaveformWidgetRenderer* waveformWidgetRenderer) : WaveformRendererAbstract(waveformWidgetRenderer), - m_beatActive(0) { + m_pBeatActive(NULL) { } WaveformRenderBeat::~WaveformRenderBeat() { - if (m_beatActive) - delete m_beatActive; + if (m_pBeatActive) + delete m_pBeatActive; } bool WaveformRenderBeat::init() { - m_beatActive = new ControlObjectThreadMain( - m_waveformRenderer->getGroup(),"beat_active"); - return m_beatActive->valid(); + m_pBeatActive = new ControlObjectThread( + m_waveformRenderer->getGroup(), "beat_active"); + return m_pBeatActive->valid(); } void WaveformRenderBeat::setup(const QDomNode& node) { diff --git a/src/waveform/renderers/waveformrenderbeat.h b/src/waveform/renderers/waveformrenderbeat.h index 3a235fe1095..511c82e6b83 100644 --- a/src/waveform/renderers/waveformrenderbeat.h +++ b/src/waveform/renderers/waveformrenderbeat.h @@ -6,7 +6,7 @@ #include "waveform/renderers/waveformrendererabstract.h" #include "util.h" -class ControlObjectThreadMain; +class ControlObjectThread; class WaveformRenderBeat : public WaveformRendererAbstract { public: @@ -19,7 +19,7 @@ class WaveformRenderBeat : public WaveformRendererAbstract { private: QColor m_beatColor; - ControlObjectThreadMain* m_beatActive; + ControlObjectThread* m_pBeatActive; DISALLOW_COPY_AND_ASSIGN(WaveformRenderBeat); }; diff --git a/src/waveform/renderers/waveformrendererendoftrack.cpp b/src/waveform/renderers/waveformrendererendoftrack.cpp index 68ca32b5c21..8b6d67d4ad6 100644 --- a/src/waveform/renderers/waveformrendererendoftrack.cpp +++ b/src/waveform/renderers/waveformrendererendoftrack.cpp @@ -16,36 +16,36 @@ WaveformRendererEndOfTrack::WaveformRendererEndOfTrack( WaveformWidgetRenderer* waveformWidgetRenderer) : WaveformRendererAbstract(waveformWidgetRenderer), - m_endOfTrackControl(NULL), + m_pEndOfTrackControl(NULL), m_endOfTrackEnabled(false), - m_trackSampleRate(NULL), - m_playControl(NULL), - m_loopControl(NULL), + m_pTrackSampleRate(NULL), + m_pPlayControl(NULL), + m_pLoopControl(NULL), m_color(200, 25, 20), m_blinkingPeriodMillis(1000), m_remainingTimeTriggerSeconds(30.0) { } WaveformRendererEndOfTrack::~WaveformRendererEndOfTrack() { - delete m_endOfTrackControl; - delete m_trackSampleRate; - delete m_playControl; - delete m_loopControl; + delete m_pEndOfTrackControl; + delete m_pTrackSampleRate; + delete m_pPlayControl; + delete m_pLoopControl; } bool WaveformRendererEndOfTrack::init() { m_timer.restart(); - m_endOfTrackControl = new ControlObjectThreadMain( + m_pEndOfTrackControl = new ControlObjectThread( m_waveformRenderer->getGroup(), "end_of_track"); - m_endOfTrackControl->slotSet(0.); + m_pEndOfTrackControl->slotSet(0.); m_endOfTrackEnabled = false; - m_trackSampleRate = new ControlObjectThreadMain( + m_pTrackSampleRate = new ControlObjectThread( m_waveformRenderer->getGroup(), "track_samplerate"); - m_playControl = new ControlObjectThreadMain( + m_pPlayControl = new ControlObjectThread( m_waveformRenderer->getGroup(), "play"); - m_loopControl = new ControlObjectThreadMain( + m_pLoopControl = new ControlObjectThread( m_waveformRenderer->getGroup(), "loop_enabled"); return true; } @@ -75,7 +75,7 @@ void WaveformRendererEndOfTrack::draw(QPainter* painter, QPaintEvent* /*event*/) { const double trackSamples = m_waveformRenderer->getTrackSamples(); - const double sampleRate = m_trackSampleRate->get(); + const double sampleRate = m_pTrackSampleRate->get(); /*qDebug() << "WaveformRendererEndOfTrack :: " << "trackSamples" << trackSamples @@ -83,19 +83,19 @@ void WaveformRendererEndOfTrack::draw(QPainter* painter, << "m_playControl->get()" << m_playControl->get() << "m_loopControl->get()" << m_loopControl->get();*/ - m_endOfTrackEnabled = m_endOfTrackControl->get() > 0.5; + m_endOfTrackEnabled = m_pEndOfTrackControl->get() > 0.5; //special case of track not long enougth const double trackLength = 0.5 * trackSamples / sampleRate; if (sampleRate < 0.1 //not ready || trackSamples < 0.1 //not ready - || m_playControl->get() < 0.5 //not playing - || m_loopControl->get() > 0.5 //in loop + || m_pPlayControl->get() < 0.5 //not playing + || m_pLoopControl->get() > 0.5 //in loop || trackLength <= m_remainingTimeTriggerSeconds //track too short ) { if (m_endOfTrackEnabled) { - m_endOfTrackControl->slotSet(0.0); + m_pEndOfTrackControl->slotSet(0.0); m_endOfTrackEnabled = false; } return; @@ -107,7 +107,7 @@ void WaveformRendererEndOfTrack::draw(QPainter* painter, if (remainingTime > m_remainingTimeTriggerSeconds) { if (m_endOfTrackEnabled) { - m_endOfTrackControl->slotSet(0.); + m_pEndOfTrackControl->slotSet(0.); m_endOfTrackEnabled = false; } return; @@ -115,7 +115,7 @@ void WaveformRendererEndOfTrack::draw(QPainter* painter, // end of track is on if (!m_endOfTrackEnabled) { - m_endOfTrackControl->slotSet(1.); + m_pEndOfTrackControl->slotSet(1.); m_endOfTrackEnabled = true; //qDebug() << "EndOfTrack ON"; diff --git a/src/waveform/renderers/waveformrendererendoftrack.h b/src/waveform/renderers/waveformrendererendoftrack.h index d065374e0d6..28b17782c0f 100644 --- a/src/waveform/renderers/waveformrendererendoftrack.h +++ b/src/waveform/renderers/waveformrendererendoftrack.h @@ -8,7 +8,7 @@ #include "waveformrendererabstract.h" class ControlObject; -class ControlObjectThreadMain; +class ControlObjectThread; class WaveformRendererEndOfTrack : public WaveformRendererAbstract { public: @@ -23,12 +23,12 @@ class WaveformRendererEndOfTrack : public WaveformRendererAbstract { virtual void draw(QPainter* painter, QPaintEvent* event); private: - ControlObjectThreadMain* m_endOfTrackControl; + ControlObjectThread* m_pEndOfTrackControl; bool m_endOfTrackEnabled; - ControlObjectThreadMain* m_trackSampleRate; - ControlObjectThreadMain* m_playControl; - ControlObjectThreadMain* m_loopControl; + ControlObjectThread* m_pTrackSampleRate; + ControlObjectThread* m_pPlayControl; + ControlObjectThread* m_pLoopControl; QColor m_color; QTime m_timer; diff --git a/src/waveform/renderers/waveformrendererfilteredsignal.cpp b/src/waveform/renderers/waveformrendererfilteredsignal.cpp index db6a2632578..a9cc19180ff 100644 --- a/src/waveform/renderers/waveformrendererfilteredsignal.cpp +++ b/src/waveform/renderers/waveformrendererfilteredsignal.cpp @@ -68,12 +68,12 @@ void WaveformRendererFilteredSignal::draw(QPainter* painter, // Per-band gain from the EQ knobs. float lowGain(1.0), midGain(1.0), highGain(1.0), allGain(1.0); - if (m_lowFilterControlObject && - m_midFilterControlObject && - m_highFilterControlObject) { - lowGain = m_lowFilterControlObject->get(); - midGain = m_midFilterControlObject->get(); - highGain = m_highFilterControlObject->get(); + if (m_pLowFilterControlObject && + m_pMidFilterControlObject && + m_pHighFilterControlObject) { + lowGain = m_pLowFilterControlObject->get(); + midGain = m_pMidFilterControlObject->get(); + highGain = m_pHighFilterControlObject->get(); } allGain = m_waveformRenderer->getGain(); @@ -226,15 +226,15 @@ void WaveformRendererFilteredSignal::draw(QPainter* painter, } painter->setPen(QPen(QBrush(m_pColors->getLowColor()), 1)); - if (m_lowKillControlObject && m_lowKillControlObject->get() == 0.0) { + if (m_pLowKillControlObject && m_pLowKillControlObject->get() == 0.0) { painter->drawLines(&m_lowLines[0], actualLowLineNumber); } painter->setPen(QPen(QBrush(m_pColors->getMidColor()), 1)); - if (m_midKillControlObject && m_midKillControlObject->get() == 0.0) { + if (m_pMidKillControlObject && m_pMidKillControlObject->get() == 0.0) { painter->drawLines(&m_midLines[0], actualMidLineNumber); } painter->setPen(QPen(QBrush(m_pColors->getHighColor()), 1)); - if (m_highKillControlObject && m_highKillControlObject->get() == 0.0) { + if (m_pHighKillControlObject && m_pHighKillControlObject->get() == 0.0) { painter->drawLines(&m_highLines[0], actualHighLineNumber); } diff --git a/src/waveform/renderers/waveformrenderersignalbase.cpp b/src/waveform/renderers/waveformrenderersignalbase.cpp index e0a51ecd384..1cc0d7b0edf 100644 --- a/src/waveform/renderers/waveformrenderersignalbase.cpp +++ b/src/waveform/renderers/waveformrenderersignalbase.cpp @@ -12,14 +12,14 @@ WaveformRendererSignalBase::WaveformRendererSignalBase( WaveformWidgetRenderer* waveformWidgetRenderer) - : WaveformRendererAbstract(waveformWidgetRenderer) { - m_lowFilterControlObject = NULL; - m_midFilterControlObject = NULL; - m_highFilterControlObject = NULL; - m_lowKillControlObject = NULL; - m_midKillControlObject = NULL; - m_highKillControlObject = NULL; - m_alignment = Qt::AlignCenter; + : WaveformRendererAbstract(waveformWidgetRenderer), + m_pLowFilterControlObject(NULL), + m_pMidFilterControlObject(NULL), + m_pHighFilterControlObject(NULL), + m_pLowKillControlObject(NULL), + m_pMidKillControlObject(NULL), + m_pHighKillControlObject(NULL), + m_alignment(Qt::AlignCenter) { } WaveformRendererSignalBase::~WaveformRendererSignalBase() { @@ -27,35 +27,35 @@ WaveformRendererSignalBase::~WaveformRendererSignalBase() { } void WaveformRendererSignalBase::deleteControls() { - if(m_lowFilterControlObject) - delete m_lowFilterControlObject; - if(m_midFilterControlObject) - delete m_midFilterControlObject; - if(m_highFilterControlObject) - delete m_highFilterControlObject; - if(m_lowKillControlObject) - delete m_lowKillControlObject; - if(m_midKillControlObject) - delete m_midKillControlObject; - if(m_highKillControlObject) - delete m_highKillControlObject; + if(m_pLowFilterControlObject) + delete m_pLowFilterControlObject; + if(m_pMidFilterControlObject) + delete m_pMidFilterControlObject; + if(m_pHighFilterControlObject) + delete m_pHighFilterControlObject; + if(m_pLowKillControlObject) + delete m_pLowKillControlObject; + if(m_pMidKillControlObject) + delete m_pMidKillControlObject; + if(m_pHighKillControlObject) + delete m_pHighKillControlObject; } bool WaveformRendererSignalBase::init() { deleteControls(); //create controls - m_lowFilterControlObject = new ControlObjectThreadMain( + m_pLowFilterControlObject = new ControlObjectThread( m_waveformRenderer->getGroup(),"filterLow"); - m_midFilterControlObject = new ControlObjectThreadMain( + m_pMidFilterControlObject = new ControlObjectThread( m_waveformRenderer->getGroup(),"filterMid"); - m_highFilterControlObject = new ControlObjectThreadMain( + m_pHighFilterControlObject = new ControlObjectThread( m_waveformRenderer->getGroup(),"filterHigh"); - m_lowKillControlObject = new ControlObjectThreadMain( + m_pLowKillControlObject = new ControlObjectThread( m_waveformRenderer->getGroup(),"filterLowKill"); - m_midKillControlObject = new ControlObjectThreadMain( + m_pMidKillControlObject = new ControlObjectThread( m_waveformRenderer->getGroup(),"filterMidKill"); - m_highKillControlObject = new ControlObjectThreadMain( + m_pHighKillControlObject = new ControlObjectThread( m_waveformRenderer->getGroup(),"filterHighKill"); return onInit(); diff --git a/src/waveform/renderers/waveformrenderersignalbase.h b/src/waveform/renderers/waveformrenderersignalbase.h index dc69ef2e4a9..3ba13200adf 100644 --- a/src/waveform/renderers/waveformrenderersignalbase.h +++ b/src/waveform/renderers/waveformrenderersignalbase.h @@ -5,7 +5,7 @@ #include "waveformsignalcolors.h" class ControlObject; -class ControlObjectThreadMain; +class ControlObjectThread; class WaveformRendererSignalBase : public WaveformRendererAbstract { public: @@ -22,13 +22,13 @@ class WaveformRendererSignalBase : public WaveformRendererAbstract { void deleteControls(); protected: - ControlObjectThreadMain* m_lowFilterControlObject; - ControlObjectThreadMain* m_midFilterControlObject; - ControlObjectThreadMain* m_highFilterControlObject; + ControlObjectThread* m_pLowFilterControlObject; + ControlObjectThread* m_pMidFilterControlObject; + ControlObjectThread* m_pHighFilterControlObject; - ControlObjectThreadMain* m_lowKillControlObject; - ControlObjectThreadMain* m_midKillControlObject; - ControlObjectThreadMain* m_highKillControlObject; + ControlObjectThread* m_pLowKillControlObject; + ControlObjectThread* m_pMidKillControlObject; + ControlObjectThread* m_pHighKillControlObject; const WaveformSignalColors* m_pColors; QColor m_axesColor; diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp index 411c574fc35..de184b6adf0 100644 --- a/src/waveform/renderers/waveformwidgetrenderer.cpp +++ b/src/waveform/renderers/waveformwidgetrenderer.cpp @@ -11,17 +11,17 @@ const int WaveformWidgetRenderer::s_waveformMinZoom = 1; const int WaveformWidgetRenderer::s_waveformMaxZoom = 6; -WaveformWidgetRenderer::WaveformWidgetRenderer() { - m_playPosControlObject = NULL; - m_rateControlObject = NULL; - m_rateRangeControlObject = NULL; - m_rateDirControlObject = NULL; - m_gainControlObject = NULL; - m_trackSamplesControlObject = NULL; - +WaveformWidgetRenderer::WaveformWidgetRenderer() + : m_pPlayPosControlObject(NULL), + m_pRateControlObject(NULL), + m_pRateRangeControlObject(NULL), + m_pRateDirControlObject(NULL), + m_pGainControlObject(NULL), + m_pTrackSamplesControlObject(NULL) #ifdef WAVEFORMWIDGETRENDERER_DEBUG - m_timer = NULL; + , m_timer(NULL) #endif +{ } WaveformWidgetRenderer::WaveformWidgetRenderer( const char* group) : @@ -42,17 +42,17 @@ WaveformWidgetRenderer::WaveformWidgetRenderer( const char* group) : m_audioSamplePerPixel = 1.0; // Really create some to manage those - m_playPosControlObject = NULL; + m_pPlayPosControlObject = NULL; m_playPos = 0.0; - m_rateControlObject = NULL; + m_pRateControlObject = NULL; m_rate = 0.0; - m_rateRangeControlObject = NULL; + m_pRateRangeControlObject = NULL; m_rateRange = 0.0; - m_rateDirControlObject = NULL; + m_pRateDirControlObject = NULL; m_rateDir = 0.0; - m_gainControlObject = NULL; + m_pGainControlObject = NULL; m_gain = 1.0; - m_trackSamplesControlObject = NULL; + m_pTrackSamplesControlObject = NULL; m_trackSamples = -1.0; @@ -74,12 +74,12 @@ WaveformWidgetRenderer::~WaveformWidgetRenderer() { for( int i = 0; i < m_rendererStack.size(); ++i) delete m_rendererStack[i]; - delete m_playPosControlObject; - delete m_rateControlObject; - delete m_rateRangeControlObject; - delete m_rateDirControlObject; - delete m_gainControlObject; - delete m_trackSamplesControlObject; + delete m_pPlayPosControlObject; + delete m_pRateControlObject; + delete m_pRateRangeControlObject; + delete m_pRateDirControlObject; + delete m_pGainControlObject; + delete m_pTrackSamplesControlObject; #ifdef WAVEFORMWIDGETRENDERER_DEBUG delete m_timer; @@ -90,17 +90,17 @@ bool WaveformWidgetRenderer::init() { //qDebug() << "WaveformWidgetRenderer::init"; - m_playPosControlObject = new ControlObjectThreadMain( + m_pPlayPosControlObject = new ControlObjectThread( m_group, "visual_playposition"); - m_rateControlObject = new ControlObjectThreadMain( + m_pRateControlObject = new ControlObjectThread( m_group, "rate"); - m_rateRangeControlObject = new ControlObjectThreadMain( + m_pRateRangeControlObject = new ControlObjectThread( m_group, "rateRange"); - m_rateDirControlObject = new ControlObjectThreadMain( + m_pRateDirControlObject = new ControlObjectThread( m_group, "rate_dir"); - m_gainControlObject = new ControlObjectThreadMain( + m_pGainControlObject = new ControlObjectThread( m_group, "total_gain"); - m_trackSamplesControlObject = new ControlObjectThreadMain( + m_pTrackSamplesControlObject = new ControlObjectThread( m_group, "track_samples"); for (int i = 0; i < m_rendererStack.size(); ++i) { @@ -113,18 +113,18 @@ bool WaveformWidgetRenderer::init() { void WaveformWidgetRenderer::onPreRender() { // For a valid track to render we need - m_trackSamples = m_trackSamplesControlObject->get(); + m_trackSamples = m_pTrackSamplesControlObject->get(); if (m_trackSamples <= 0.0) { return; } //Fetch parameters before rendering in order the display all sub-renderers with the same values - m_rate = m_rateControlObject->get(); - m_rateDir = m_rateDirControlObject->get(); - m_rateRange = m_rateRangeControlObject->get(); + m_rate = m_pRateControlObject->get(); + m_rateDir = m_pRateDirControlObject->get(); + m_rateRange = m_pRateRangeControlObject->get(); // This gain adjustment compensates for an arbitrary /2 gain chop in // EnginePregain. See the comment there. - m_gain = m_gainControlObject->get() * 2; + m_gain = m_pGainControlObject->get() * 2; //Legacy stuff (Ryan it that OK?) -> Limit our rate adjustment to < 99%, "Bad Things" might happen otherwise. m_rateAdjust = m_rateDir * math_min(0.99, m_rate * m_rateRange); @@ -141,7 +141,7 @@ void WaveformWidgetRenderer::onPreRender() { m_audioSamplePerPixel = 0.0; } - m_playPos = m_playPosControlObject->get(); + m_playPos = m_pPlayPosControlObject->get(); // m_playPos = -1 happens, when a new track is in buffer but m_visualPlayPosition was not updated if (m_audioSamplePerPixel && m_playPos != -1) { @@ -153,7 +153,7 @@ void WaveformWidgetRenderer::onPreRender() { double displayedLengthHalf = static_cast(m_width) / trackPixel / 2.0; // Avoid pixel jitter in play position by rounding to the nearest track // pixel. - m_playPos = round(m_playPosControlObject->get() * trackPixel) / trackPixel; + m_playPos = round(m_pPlayPosControlObject->get() * trackPixel) / trackPixel; m_firstDisplayedPosition = m_playPos - displayedLengthHalf; m_lastDisplayedPosition = m_playPos + displayedLengthHalf; m_rendererTransformationOffset = - m_firstDisplayedPosition; diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h index e1351e24abf..8ac21fa739e 100644 --- a/src/waveform/renderers/waveformwidgetrenderer.h +++ b/src/waveform/renderers/waveformwidgetrenderer.h @@ -14,7 +14,7 @@ //#define WAVEFORMWIDGETRENDERER_DEBUG class TrackInfoObject; -class ControlObjectThreadMain; +class ControlObjectThread; class WaveformWidgetRenderer { public: @@ -95,17 +95,17 @@ class WaveformWidgetRenderer { //TODO: vRince create some class to manage control/value //ControlConnection - ControlObjectThreadMain* m_playPosControlObject; + ControlObjectThread* m_pPlayPosControlObject; double m_playPos; - ControlObjectThreadMain* m_rateControlObject; + ControlObjectThread* m_pRateControlObject; double m_rate; - ControlObjectThreadMain* m_rateRangeControlObject; + ControlObjectThread* m_pRateRangeControlObject; double m_rateRange; - ControlObjectThreadMain* m_rateDirControlObject; + ControlObjectThread* m_pRateDirControlObject; double m_rateDir; - ControlObjectThreadMain* m_gainControlObject; + ControlObjectThread* m_pGainControlObject; double m_gain; - ControlObjectThreadMain* m_trackSamplesControlObject; + ControlObjectThread* m_pTrackSamplesControlObject; int m_trackSamples; #ifdef WAVEFORMWIDGETRENDERER_DEBUG diff --git a/src/widget/wnumberpos.cpp b/src/widget/wnumberpos.cpp index 3e69c64d27f..483f0d47b20 100644 --- a/src/widget/wnumberpos.cpp +++ b/src/widget/wnumberpos.cpp @@ -17,7 +17,7 @@ WNumberPos::WNumberPos(const char* group, QWidget* parent) m_bRemain(false) { m_qsText = ""; - m_pShowTrackTimeRemaining = new ControlObjectThreadMain( + m_pShowTrackTimeRemaining = new ControlObjectThread( "[Controls]", "ShowDurationRemaining"); connect(m_pShowTrackTimeRemaining, SIGNAL(valueChanged(double)), this, SLOT(slotSetRemain(double))); diff --git a/src/widget/wnumberpos.h b/src/widget/wnumberpos.h index a61be2b4fa5..36d842ec867 100644 --- a/src/widget/wnumberpos.h +++ b/src/widget/wnumberpos.h @@ -6,11 +6,7 @@ #include "wnumber.h" class ControlObjectThreadWidget; -class ControlObjectThreadMain; - -/** -@author Tue Haste Andersen -*/ +class ControlObjectThread; class WNumberPos : public WNumber { Q_OBJECT @@ -19,7 +15,7 @@ class WNumberPos : public WNumber { virtual ~WNumberPos(); void setValue(double dValue); - /** Set if the display shows remaining time (true) or position (false) */ + // Set if the display shows remaining time (true) or position (false) void setRemain(bool bRemain); protected: @@ -32,17 +28,17 @@ class WNumberPos : public WNumber { void slotSetTrackSamples(double dSamples); private: - /** Old value set */ + // Old value set double m_dOldValue; double m_dTrackSamples; double m_dTrackSampleRate; - /** True if remaining content is being shown */ + // True if remaining content is being shown bool m_bRemain; - ControlObjectThreadMain* m_pShowTrackTimeRemaining; + ControlObjectThread* m_pShowTrackTimeRemaining; // Pointer to control object for position, rate, and track info - ControlObjectThreadMain* m_pVisualPlaypos; + ControlObjectThread* m_pVisualPlaypos; ControlObjectThreadWidget* m_pTrackSamples; ControlObjectThreadWidget* m_pTrackSampleRate; }; -#endif +#endif \ No newline at end of file diff --git a/src/widget/wnumberrate.cpp b/src/widget/wnumberrate.cpp index f5e7a4eaed8..ef8370dca4b 100644 --- a/src/widget/wnumberrate.cpp +++ b/src/widget/wnumberrate.cpp @@ -14,31 +14,31 @@ #include "controlobject.h" #include "controlobjectthreadmain.h" -WNumberRate::WNumberRate(const char * group, QWidget * parent) : WNumber(parent) -{ - m_pRateRangeControl = new ControlObjectThreadMain(group, "rateRange"); +WNumberRate::WNumberRate(const char * group, QWidget * parent) + : WNumber(parent) { + m_pRateRangeControl = new ControlObjectThread(group, "rateRange"); connect(m_pRateRangeControl, SIGNAL(valueChanged(double)), this, SLOT(setValue(double))); - m_pRateDirControl = new ControlObjectThreadMain(group, "rate_dir"); + m_pRateDirControl = new ControlObjectThread(group, "rate_dir"); connect(m_pRateDirControl, SIGNAL(valueChanged(double)), this, SLOT(setValue(double))); - m_pRateControl = new ControlObjectThreadMain(group, "rate"); + m_pRateControl = new ControlObjectThread(group, "rate"); connect(m_pRateControl, SIGNAL(valueChanged(double)), this, SLOT(setValue(double))); // Initialize the widget. setValue(0); } -WNumberRate::~WNumberRate() -{ +WNumberRate::~WNumberRate() { delete m_pRateControl; delete m_pRateDirControl; delete m_pRateRangeControl; } -void WNumberRate::setValue(double) -{ - double vsign = m_pRateControl->get()*m_pRateRangeControl->get()*m_pRateDirControl->get(); +void WNumberRate::setValue(double) { + double vsign = m_pRateControl->get() * + m_pRateRangeControl->get() * + m_pRateDirControl->get(); char sign = '+'; if (vsign < -0.00000001) { diff --git a/src/widget/wnumberrate.h b/src/widget/wnumberrate.h index 46c2a60088b..e28172b1c60 100644 --- a/src/widget/wnumberrate.h +++ b/src/widget/wnumberrate.h @@ -13,7 +13,7 @@ #define WNUMBERRATE_H #include "wnumber.h" -class ControlObjectThreadMain; +class ControlObjectThread; /** @author Tue Haste Andersen @@ -29,9 +29,9 @@ class WNumberRate : public WNumber private: // Pointer to control object for rate - ControlObjectThreadMain* m_pRateControl; - ControlObjectThreadMain* m_pRateRangeControl; - ControlObjectThreadMain* m_pRateDirControl; + ControlObjectThread* m_pRateControl; + ControlObjectThread* m_pRateRangeControl; + ControlObjectThread* m_pRateDirControl; }; #endif diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp index 8c10810058f..52045c01ba6 100644 --- a/src/widget/woverview.cpp +++ b/src/widget/woverview.cpp @@ -47,12 +47,12 @@ WOverview::WOverview(const char *pGroup, ConfigObject* pConfig, QWi m_b(0.0), m_analyserProgress(-1), m_trackLoaded(false) { - m_endOfTrackControl = new ControlObjectThreadMain( + m_endOfTrackControl = new ControlObjectThread( m_group, "end_of_track"); connect(m_endOfTrackControl, SIGNAL(valueChanged(double)), this, SLOT(onEndOfTrackChange(double))); - m_trackSamplesControl = new ControlObjectThreadMain(m_group, "track_samples"); - m_playControl = new ControlObjectThreadMain(m_group, "play"); + m_trackSamplesControl = new ControlObjectThread(m_group, "track_samples"); + m_playControl = new ControlObjectThread(m_group, "play"); setAcceptDrops(true); } diff --git a/src/widget/woverview.h b/src/widget/woverview.h index 4e43063f7b7..9b761c6668d 100644 --- a/src/widget/woverview.h +++ b/src/widget/woverview.h @@ -93,10 +93,10 @@ class WOverview : public WWidget { const QString m_group; ConfigObject* m_pConfig; - ControlObjectThreadMain* m_endOfTrackControl; + ControlObjectThread* m_endOfTrackControl; double m_endOfTrack; - ControlObjectThreadMain* m_trackSamplesControl; - ControlObjectThreadMain* m_playControl; + ControlObjectThread* m_trackSamplesControl; + ControlObjectThread* m_playControl; // Current active track diff --git a/src/widget/wspinny.cpp b/src/widget/wspinny.cpp index 2c98c2b365d..613b1541f63 100644 --- a/src/widget/wspinny.cpp +++ b/src/widget/wspinny.cpp @@ -19,7 +19,6 @@ WSpinny::WSpinny(QWidget* parent, VinylControlManager* pVCMan) m_pPlay(NULL), m_pPlayPos(NULL), m_pVisualPlayPos(NULL), - m_pDuration(NULL), m_pTrackSamples(NULL), m_pScratch(NULL), m_pScratchToggle(NULL), @@ -58,7 +57,6 @@ WSpinny::~WSpinny() { delete m_pPlay; delete m_pPlayPos; delete m_pVisualPlayPos; - delete m_pDuration; delete m_pTrackSamples; delete m_pTrackSampleRate; delete m_pScratch; @@ -128,33 +126,31 @@ void WSpinny::setup(QDomNode node, QString group) { m_qImage.fill(qRgba(0,0,0,0)); #endif - m_pPlay = new ControlObjectThreadMain( + m_pPlay = new ControlObjectThread( group, "play"); - m_pPlayPos = new ControlObjectThreadMain( + m_pPlayPos = new ControlObjectThread( group, "playposition"); - m_pVisualPlayPos = new ControlObjectThreadMain( + m_pVisualPlayPos = new ControlObjectThread( group, "visual_playposition"); - m_pDuration = new ControlObjectThreadMain( - group, "duration"); - m_pTrackSamples = new ControlObjectThreadMain( + m_pTrackSamples = new ControlObjectThread( group, "track_samples"); - m_pTrackSampleRate = new ControlObjectThreadMain( + m_pTrackSampleRate = new ControlObjectThread( group, "track_samplerate"); - m_pScratch = new ControlObjectThreadMain( + m_pScratch = new ControlObjectThread( group, "scratch2"); - m_pScratchToggle = new ControlObjectThreadMain( + m_pScratchToggle = new ControlObjectThread( group, "scratch_position_enable"); - m_pScratchPos = new ControlObjectThreadMain( + m_pScratchPos = new ControlObjectThread( group, "scratch_position"); - m_pSlipEnabled = new ControlObjectThreadMain( + m_pSlipEnabled = new ControlObjectThread( group, "slip_enabled"); - m_pSlipPosition = new ControlObjectThreadMain( + m_pSlipPosition = new ControlObjectThread( group, "slip_playposition"); #ifdef __VINYLCONTROL__ - m_pVinylControlSpeedType = new ControlObjectThreadMain( + m_pVinylControlSpeedType = new ControlObjectThread( group, "vinylcontrol_speed_type"); if (m_pVinylControlSpeedType) { @@ -162,12 +158,12 @@ void WSpinny::setup(QDomNode node, QString group) { this->updateVinylControlSpeed(m_pVinylControlSpeedType->get()); } - m_pVinylControlEnabled = new ControlObjectThreadMain( + m_pVinylControlEnabled = new ControlObjectThread( group, "vinylcontrol_enabled"); connect(m_pVinylControlEnabled, SIGNAL(valueChanged(double)), this, SLOT(updateVinylControlEnabled(double))); - m_pSignalEnabled = new ControlObjectThreadMain( + m_pSignalEnabled = new ControlObjectThread( group, "vinylcontrol_signal_enabled"); connect(m_pSignalEnabled, SIGNAL(valueChanged(double)), this, SLOT(updateVinylControlSignalEnabled(double))); @@ -304,15 +300,14 @@ int WSpinny::calculateFullRotations(double playpos) if (isnan(playpos)) return 0.0f; //Convert playpos to seconds. - //double t = playpos * m_pDuration->get(); - double t = playpos * (m_pTrackSamples->get()/2 / // Stereo audio! + double t = playpos * (m_pTrackSamples->get() / 2 / // Stereo audio! m_pTrackSampleRate->get()); //33 RPM is approx. 0.5 rotations per second. //qDebug() << t; - double angle = 360*m_dRotationsPerSecond*t; + double angle = 360 * m_dRotationsPerSecond * t; - return (((int)angle+180) / 360); + return (((int)angle + 180) / 360); } //Inverse of calculateAngle() @@ -332,8 +327,7 @@ double WSpinny::calculatePositionFromAngle(double angle) return 0.0f; } - //Convert t from seconds into a normalized playposition value. - //double playpos = t / m_pDuration->get(); + // Convert t from seconds into a normalized playposition value. double playpos = t * trackSampleRate / trackFrames; if (isnan(playpos)) { return 0.0; diff --git a/src/widget/wspinny.h b/src/widget/wspinny.h index 8b425e01908..de87a52a2b6 100644 --- a/src/widget/wspinny.h +++ b/src/widget/wspinny.h @@ -9,7 +9,7 @@ #include "widget/wwidget.h" #include "vinylcontrol/vinylsignalquality.h" -class ControlObjectThreadMain; +class ControlObjectThread; class VinylControlManager; class WSpinny : public QGLWidget, public VinylSignalQualityListener { @@ -50,21 +50,20 @@ class WSpinny : public QGLWidget, public VinylSignalQualityListener { QImage* m_pBgImage; QImage* m_pFgImage; QImage* m_pGhostImage; - ControlObjectThreadMain* m_pPlay; - ControlObjectThreadMain* m_pPlayPos; - ControlObjectThreadMain* m_pVisualPlayPos; - ControlObjectThreadMain* m_pDuration; - ControlObjectThreadMain* m_pTrackSamples; - ControlObjectThreadMain* m_pTrackSampleRate; - ControlObjectThreadMain* m_pScratch; - ControlObjectThreadMain* m_pScratchToggle; - ControlObjectThreadMain* m_pScratchPos; - ControlObjectThreadMain* m_pRate; - ControlObjectThreadMain* m_pVinylControlSpeedType; - ControlObjectThreadMain* m_pVinylControlEnabled; - ControlObjectThreadMain* m_pSignalEnabled; - ControlObjectThreadMain* m_pSlipEnabled; - ControlObjectThreadMain* m_pSlipPosition; + ControlObjectThread* m_pPlay; + ControlObjectThread* m_pPlayPos; + ControlObjectThread* m_pVisualPlayPos; + ControlObjectThread* m_pTrackSamples; + ControlObjectThread* m_pTrackSampleRate; + ControlObjectThread* m_pScratch; + ControlObjectThread* m_pScratchToggle; + ControlObjectThread* m_pScratchPos; + ControlObjectThread* m_pRate; + ControlObjectThread* m_pVinylControlSpeedType; + ControlObjectThread* m_pVinylControlEnabled; + ControlObjectThread* m_pSignalEnabled; + ControlObjectThread* m_pSlipEnabled; + ControlObjectThread* m_pSlipPosition; #ifdef __VINYLCONTROL__ VinylControlManager* m_pVCManager; diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index 289fc8f7b5e..1403b682eb2 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -50,11 +50,11 @@ WTrackTableView::WTrackTableView(QWidget * parent, connect(&m_BpmMapper, SIGNAL(mapped(int)), this, SLOT(slotScaleBpm(int))); - m_pNumSamplers = new ControlObjectThreadMain( + m_pNumSamplers = new ControlObjectThread( "[Master]", "num_samplers"); - m_pNumDecks = new ControlObjectThreadMain( + m_pNumDecks = new ControlObjectThread( "[Master]", "num_decks"); - m_pNumPreviewDecks = new ControlObjectThreadMain( + m_pNumPreviewDecks = new ControlObjectThread( "[Master]", "num_preview_decks"); m_pMenu = new QMenu(this); diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h index b7a4e8b2850..ffb715e0feb 100644 --- a/src/widget/wtracktableview.h +++ b/src/widget/wtracktableview.h @@ -11,7 +11,7 @@ #include "widget/wlibrarytableview.h" #include "dlgtagfetcher.h" -class ControlObjectThreadMain; +class ControlObjectThread; class DlgTrackInfo; class TrackCollection; @@ -98,9 +98,9 @@ class WTrackTableView : public WLibraryTableView { QModelIndex currentTrackInfoIndex; - ControlObjectThreadMain* m_pNumSamplers; - ControlObjectThreadMain* m_pNumDecks; - ControlObjectThreadMain* m_pNumPreviewDecks; + ControlObjectThread* m_pNumSamplers; + ControlObjectThread* m_pNumDecks; + ControlObjectThread* m_pNumPreviewDecks; // Context menu machinery QMenu *m_pMenu, *m_pPlaylistMenu, *m_pCrateMenu, *m_pSamplerMenu, *m_pBPMMenu; diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp index b1ccf7d3e84..774c8889a25 100644 --- a/src/widget/wwaveformviewer.cpp +++ b/src/widget/wwaveformviewer.cpp @@ -24,14 +24,14 @@ WWaveformViewer::WWaveformViewer(const char *group, ConfigObject* p m_bScratching = false; m_bBending = false; - m_pZoom = new ControlObjectThreadMain(group, "waveform_zoom"); + m_pZoom = new ControlObjectThread(group, "waveform_zoom"); connect(m_pZoom, SIGNAL(valueChanged(double)), this, SLOT(onZoomChange(double))); - m_pScratchPositionEnable = new ControlObjectThreadMain( + m_pScratchPositionEnable = new ControlObjectThread( group, "scratch_position_enable"); - m_pScratchPosition = new ControlObjectThreadMain( + m_pScratchPosition = new ControlObjectThread( group, "scratch_position"); setAttribute(Qt::WA_OpaquePaintEvent); diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h index a93ab9a025a..17d6240a910 100644 --- a/src/widget/wwaveformviewer.h +++ b/src/widget/wwaveformviewer.h @@ -12,7 +12,7 @@ #include "trackinfoobject.h" #include "widget/wwidget.h" -class ControlObjectThreadMain; +class ControlObjectThread; class WaveformWidgetAbstract; class ControlPotmeter; @@ -64,9 +64,9 @@ private slots: const char* m_pGroup; ConfigObject* m_pConfig; int m_zoomZoneWidth; - ControlObjectThreadMain* m_pZoom; - ControlObjectThreadMain* m_pScratchPositionEnable; - ControlObjectThreadMain* m_pScratchPosition; + ControlObjectThread* m_pZoom; + ControlObjectThread* m_pScratchPositionEnable; + ControlObjectThread* m_pScratchPosition; bool m_bScratching; bool m_bBending; QPoint m_mouseAnchor; diff --git a/src/widget/wwidgetstack.h b/src/widget/wwidgetstack.h index eef128b4a80..2ec3c52bd68 100644 --- a/src/widget/wwidgetstack.h +++ b/src/widget/wwidgetstack.h @@ -26,7 +26,7 @@ class WidgetStackControlListener : public QObject { void slotValueChanged(double v); private: - ControlObjectThreadMain m_control; + ControlObjectThread m_control; const int m_index; }; @@ -46,8 +46,8 @@ class WWidgetStack : public QStackedWidget { private: QSignalMapper m_mapper; - ControlObjectThreadMain m_nextControl; - ControlObjectThreadMain m_prevControl; + ControlObjectThread m_nextControl; + ControlObjectThread m_prevControl; }; #endif /* WWIDGETSTACK_H */