From 89eae05a167d750891b24ea5e08cfd7465b7a8ee Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 16 Aug 2010 20:18:24 +0200 Subject: [PATCH] Renamed all automation related files and classes to match new coding style All automation-related files and classes have been renamed to match the new coding style. (cherry picked from commit 9b280ffb3eaceb4145903e1eb05e1d31f0dd571b) --- data/themes/default/style.css | 2 +- ...automation_editor.h => AutomationEditor.h} | 22 ++-- ...tomation_pattern.h => AutomationPattern.h} | 24 ++--- ...pattern_view.h => AutomationPatternView.h} | 17 ++- .../{automation_track.h => AutomationTrack.h} | 25 +++-- .../{detuning_helper.h => DetuningHelper.h} | 21 ++-- ...inline_automation.h => InlineAutomation.h} | 16 +-- include/engine.h | 6 +- include/note.h | 13 ++- include/note_play_handle.h | 6 +- include/song.h | 8 +- include/surround_area.h | 4 +- include/track_container.h | 4 +- plugins/flp_import/FlpImport.cpp | 4 +- plugins/ladspa_effect/LadspaEffect.cpp | 10 +- plugins/midi_import/MidiImport.cpp | 22 ++-- src/core/AutomatableModel.cpp | 8 +- ...tion_pattern.cpp => AutomationPattern.cpp} | 102 +++++++++--------- ...ne_automation.cpp => InlineAutomation.cpp} | 21 ++-- src/core/engine.cpp | 6 +- src/core/note.cpp | 10 +- src/core/note_play_handle.cpp | 10 +- src/core/song.cpp | 29 ++--- src/core/track.cpp | 14 +-- src/gui/AutomatableModelView.cpp | 4 +- ...mation_editor.cpp => AutomationEditor.cpp} | 98 ++++++++--------- ...ern_view.cpp => AutomationPatternView.cpp} | 49 ++++----- src/gui/MainWindow.cpp | 4 +- src/gui/piano_roll.cpp | 6 +- src/gui/widgets/combobox.cpp | 6 +- ...tomation_track.cpp => AutomationTrack.cpp} | 47 ++++---- src/tracks/InstrumentTrack.cpp | 4 +- 32 files changed, 303 insertions(+), 319 deletions(-) rename include/{automation_editor.h => AutomationEditor.h} (89%) rename include/{automation_pattern.h => AutomationPattern.h} (80%) rename include/{automation_pattern_view.h => AutomationPatternView.h} (80%) rename include/{automation_track.h => AutomationTrack.h} (74%) rename include/{detuning_helper.h => DetuningHelper.h} (79%) rename include/{inline_automation.h => InlineAutomation.h} (82%) rename src/core/{automation_pattern.cpp => AutomationPattern.cpp} (78%) rename src/core/{inline_automation.cpp => InlineAutomation.cpp} (70%) rename src/gui/{automation_editor.cpp => AutomationEditor.cpp} (95%) rename src/gui/{automation_pattern_view.cpp => AutomationPatternView.cpp} (85%) rename src/tracks/{automation_track.cpp => AutomationTrack.cpp} (72%) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 6f96a787c..c9ccc3410 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -8,7 +8,7 @@ QMdiArea { background-image: url(resources:background_artwork.png); } -automationEditor { +AutomationEditor { background-color: rgb(0, 0, 0); } diff --git a/include/automation_editor.h b/include/AutomationEditor.h similarity index 89% rename from include/automation_editor.h rename to include/AutomationEditor.h index 22a097fd1..1a90f2a7f 100644 --- a/include/automation_editor.h +++ b/include/AutomationEditor.h @@ -1,6 +1,6 @@ /* - * automation_editor.h - declaration of class automationEditor which is a window - * where you can edit dynamic values in an easy way + * AutomationEditor.h - declaration of class AutomationEditor which is a window + * where you can edit dynamic values in an easy way * * Copyright (c) 2006-2008 Javier Serrano Polo * @@ -32,7 +32,7 @@ #include "lmms_basics.h" #include "JournallingObject.h" #include "midi_time.h" -#include "automation_pattern.h" +#include "AutomationPattern.h" #include "ComboBoxModel.h" @@ -46,13 +46,13 @@ class timeLine; class toolButton; -class automationEditor : public QWidget, public JournallingObject +class AutomationEditor : public QWidget, public JournallingObject { Q_OBJECT public: - void setCurrentPattern( automationPattern * _new_pattern ); + void setCurrentPattern( AutomationPattern * _new_pattern ); - inline const automationPattern * currentPattern() const + inline const AutomationPattern * currentPattern() const { return( m_pattern ); } @@ -79,7 +79,7 @@ public slots: protected: - typedef automationPattern::timeMap timeMap; + typedef AutomationPattern::timeMap timeMap; virtual void closeEvent( QCloseEvent * _ce ); virtual void keyPressEvent( QKeyEvent * _ke ); @@ -155,9 +155,9 @@ private: static const int VALUES_WIDTH = 64; - automationEditor(); - automationEditor( const automationEditor & ); - virtual ~automationEditor(); + AutomationEditor(); + AutomationEditor( const AutomationEditor & ); + virtual ~AutomationEditor(); static QPixmap * s_toolDraw; @@ -189,7 +189,7 @@ private: ComboBoxModel m_quantizeModel; QMutex m_patternMutex; - automationPattern * m_pattern; + AutomationPattern * m_pattern; float m_minLevel; float m_maxLevel; float m_step; diff --git a/include/automation_pattern.h b/include/AutomationPattern.h similarity index 80% rename from include/automation_pattern.h rename to include/AutomationPattern.h index acae3f29c..391283bf2 100644 --- a/include/automation_pattern.h +++ b/include/AutomationPattern.h @@ -1,8 +1,8 @@ /* - * automation_pattern.h - declaration of class automationPattern, which contains - * all information about an automation pattern + * AutomationPattern.h - declaration of class AutomationPattern, which contains + * all information about an automation pattern * - * Copyright (c) 2008 Tobias Doerffel + * Copyright (c) 2008-2010 Tobias Doerffel * Copyright (c) 2006-2008 Javier Serrano Polo * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net @@ -24,7 +24,6 @@ * */ - #ifndef _AUTOMATION_PATTERN_H #define _AUTOMATION_PATTERN_H @@ -33,21 +32,21 @@ #include "track.h" -class automationTrack; +class AutomationTrack; class midiTime; -class EXPORT automationPattern : public trackContentObject +class EXPORT AutomationPattern : public trackContentObject { Q_OBJECT public: typedef QMap timeMap; typedef QVector > objectVector; - automationPattern( automationTrack * _auto_track ); - automationPattern( const automationPattern & _pat_to_copy ); - virtual ~automationPattern(); + AutomationPattern( AutomationTrack * _auto_track ); + AutomationPattern( const AutomationPattern & _pat_to_copy ); + virtual ~AutomationPattern(); void addObject( AutomatableModel * _obj, bool _search_dup = true ); @@ -99,8 +98,7 @@ public: static bool isAutomated( const AutomatableModel * _m ); - static automationPattern * globalAutomationPattern( - AutomatableModel * _m ); + static AutomationPattern * globalAutomationPattern( AutomatableModel * _m ); static void resolveAllIDs(); @@ -111,14 +109,14 @@ public slots: private: - automationTrack * m_autoTrack; + AutomationTrack * m_autoTrack; QVector m_idsToResolve; objectVector m_objects; timeMap m_timeMap; // actual values bool m_hasAutomation; - friend class automationPatternView; + friend class AutomationPatternView; } ; diff --git a/include/automation_pattern_view.h b/include/AutomationPatternView.h similarity index 80% rename from include/automation_pattern_view.h rename to include/AutomationPatternView.h index 881180d74..4a58cc30c 100644 --- a/include/automation_pattern_view.h +++ b/include/AutomationPatternView.h @@ -1,8 +1,8 @@ /* - * automation_pattern_view.h - declaration of class automationPatternView + * AutomationPatternView.h - declaration of class AutomationPatternView + * + * Copyright (c) 2008-2010 Tobias Doerffel * - * Copyright (c) 2008 Tobias Doerffel - * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -22,21 +22,20 @@ * */ - #ifndef _AUTOMATION_PATTERN_VIEW_H #define _AUTOMATION_PATTERN_VIEW_H #include "track.h" -class automationPattern; +class AutomationPattern; -class automationPatternView : public trackContentObjectView +class AutomationPatternView : public trackContentObjectView { Q_OBJECT public: - automationPatternView( automationPattern * _pat, trackView * _parent ); - virtual ~automationPatternView(); + AutomationPatternView( AutomationPattern * _pat, trackView * _parent ); + virtual ~AutomationPatternView(); public slots: @@ -63,7 +62,7 @@ protected: private: - automationPattern * m_pat; + AutomationPattern * m_pat; QPixmap m_paintPixmap; bool m_needsUpdate; diff --git a/include/automation_track.h b/include/AutomationTrack.h similarity index 74% rename from include/automation_track.h rename to include/AutomationTrack.h index 18d43ede6..94dbe66f9 100644 --- a/include/automation_track.h +++ b/include/AutomationTrack.h @@ -1,10 +1,10 @@ /* - * automation_track.h - declaration of class automationTrack, which handles - * automation of objects without a track + * AutomationTrack.h - declaration of class AutomationTrack, which handles + * automation of objects without a track * - * Copyright (c) 2008 Tobias Doerffel + * Copyright (c) 2008-2010 Tobias Doerffel * Copyright (c) 2006-2008 Javier Serrano Polo - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -24,18 +24,17 @@ * */ - #ifndef _AUTOMATION_TRACK_H #define _AUTOMATION_TRACK_H #include "track.h" -class automationTrack : public track +class AutomationTrack : public track { public: - automationTrack( trackContainer * _tc, bool _hidden = false ); - virtual ~automationTrack(); + AutomationTrack( trackContainer * _tc, bool _hidden = false ); + virtual ~AutomationTrack(); virtual bool play( const midiTime & _start, const fpp_t _frames, const f_cnt_t _frame_base, @@ -43,7 +42,7 @@ public: virtual QString nodeName() const { - return( "automationtrack" ); + return "automationtrack"; } virtual trackView * createView( trackContainerView * ); @@ -54,17 +53,17 @@ public: virtual void loadTrackSpecificSettings( const QDomElement & _this ); private: - friend class automationTrackView; + friend class AutomationTrackView; } ; -class automationTrackView : public trackView +class AutomationTrackView : public trackView { public: - automationTrackView( automationTrack * _at, trackContainerView * _tcv ); - virtual ~automationTrackView(); + AutomationTrackView( AutomationTrack * _at, trackContainerView * _tcv ); + virtual ~AutomationTrackView(); virtual void dragEnterEvent( QDragEnterEvent * _dee ); virtual void dropEvent( QDropEvent * _de ); diff --git a/include/detuning_helper.h b/include/DetuningHelper.h similarity index 79% rename from include/detuning_helper.h rename to include/DetuningHelper.h index 8ddf4eac0..2d675ca49 100644 --- a/include/detuning_helper.h +++ b/include/DetuningHelper.h @@ -2,8 +2,8 @@ * detuning_helper.h - detuning automation helper * * Copyright (c) 2007 Javier Serrano Polo - * Copyright (c) 2008 Tobias Doerffel - * + * Copyright (c) 2008-2010 Tobias Doerffel + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -23,38 +23,37 @@ * */ - #ifndef _DETUNING_HELPER_H #define _DETUNING_HELPER_H -#include "inline_automation.h" +#include "InlineAutomation.h" -class detuningHelper : public inlineAutomation +class DetuningHelper : public InlineAutomation { public: - detuningHelper() : - inlineAutomation() + DetuningHelper() : + InlineAutomation() { } - virtual ~detuningHelper() + virtual ~DetuningHelper() { } virtual float defaultValue() const { - return( 0 ); + return 0; } virtual QString displayName() const { - return( tr( "Note detuning" ) ); + return tr( "Note detuning" ); } inline virtual QString nodeName() const { - return( "detuning" ); + return "detuning"; } } ; diff --git a/include/inline_automation.h b/include/InlineAutomation.h similarity index 82% rename from include/inline_automation.h rename to include/InlineAutomation.h index 6c4d5ea21..89f3e9164 100644 --- a/include/inline_automation.h +++ b/include/InlineAutomation.h @@ -1,5 +1,5 @@ /* - * inline_automation.h - class for automating something "inline" + * InlineAutomation.h - class for automating something "inline" * * Copyright (c) 2008-2010 Tobias Doerffel * @@ -25,21 +25,21 @@ #ifndef _INLINE_AUTOMATION_H #define _INLINE_AUTOMATION_H -#include "automation_pattern.h" +#include "AutomationPattern.h" #include "shared_object.h" -class inlineAutomation : public FloatModel, public sharedObject +class InlineAutomation : public FloatModel, public sharedObject { public: - inlineAutomation() : + InlineAutomation() : FloatModel(), sharedObject(), m_autoPattern( NULL ) { } - virtual ~inlineAutomation() + virtual ~InlineAutomation() { if( m_autoPattern ) { @@ -57,11 +57,11 @@ public: defaultValue() ); } - automationPattern * getAutomationPattern() + AutomationPattern * automationPattern() { if( m_autoPattern == NULL ) { - m_autoPattern = new automationPattern( NULL ); + m_autoPattern = new AutomationPattern( NULL ); m_autoPattern->addObject( this ); } return m_autoPattern; @@ -72,7 +72,7 @@ public: private: - automationPattern * m_autoPattern; + AutomationPattern * m_autoPattern; } ; diff --git a/include/engine.h b/include/engine.h index 669570379..adbbdc33d 100644 --- a/include/engine.h +++ b/include/engine.h @@ -32,7 +32,7 @@ #include "export.h" -class automationEditor; +class AutomationEditor; class bbEditor; class bbTrackContainer; class DummyTrackContainer; @@ -127,7 +127,7 @@ public: return s_projectNotes; } - static automationEditor * getAutomationEditor() + static AutomationEditor * automationEditor() { return s_automationEditor; } @@ -187,7 +187,7 @@ private: static MainWindow * s_mainWindow; static FxMixerView * s_fxMixerView; static songEditor * s_songEditor; - static automationEditor * s_automationEditor; + static AutomationEditor * s_automationEditor; static bbEditor * s_bbEditor; static pianoRoll * s_pianoRoll; static projectNotes * s_projectNotes; diff --git a/include/note.h b/include/note.h index 96ba0270a..36bf1640d 100644 --- a/include/note.h +++ b/include/note.h @@ -2,8 +2,8 @@ * note.h - declaration of class note which contains all informations about a * note + definitions of several constants and enums * - * Copyright (c) 2004-2009 Tobias Doerffel - * + * Copyright (c) 2004-2010 Tobias Doerffel + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -23,7 +23,6 @@ * */ - #ifndef _NOTE_H #define _NOTE_H @@ -34,7 +33,7 @@ #include "midi_time.h" #include "SerializingObject.h" -class detuningHelper; +class DetuningHelper; enum Keys @@ -87,7 +86,7 @@ public: int key = DefaultKey, volume_t _volume = DefaultVolume, panning_t _panning = DefaultPanning, - detuningHelper * _detuning = NULL ); + DetuningHelper * _detuning = NULL ); note( const note & _note ); virtual ~note(); @@ -194,7 +193,7 @@ public: static midiTime quantized( const midiTime & _m, const int _q_grid ); - detuningHelper * detuning() const + DetuningHelper * detuning() const { return m_detuning; } @@ -236,7 +235,7 @@ private: panning_t m_panning; midiTime m_length; midiTime m_pos; - detuningHelper * m_detuning; + DetuningHelper * m_detuning; void createDetuning(); diff --git a/include/note_play_handle.h b/include/note_play_handle.h index 84fe3b888..e242b359a 100644 --- a/include/note_play_handle.h +++ b/include/note_play_handle.h @@ -2,7 +2,7 @@ * note_play_handle.h - declaration of class notePlayHandle which is needed * by LMMS-Play-Engine * - * Copyright (c) 2004-2009 Tobias Doerffel + * Copyright (c) 2004-2010 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -203,7 +203,7 @@ private: class baseDetuning { public: - baseDetuning( detuningHelper * _detuning ); + baseDetuning( DetuningHelper * _detuning ); void setValue( float _val ) { @@ -217,7 +217,7 @@ private: private: - detuningHelper * m_detuning; + DetuningHelper * m_detuning; float m_value; } ; diff --git a/include/song.h b/include/song.h index 52fb367d1..8330453be 100644 --- a/include/song.h +++ b/include/song.h @@ -34,7 +34,7 @@ #include "MeterModel.h" -class automationTrack; +class AutomationTrack; class pattern; class timeLine; @@ -141,9 +141,9 @@ public: bpm_t getTempo(); - virtual automationPattern * tempoAutomationPattern(); + virtual AutomationPattern * tempoAutomationPattern(); - automationTrack * globalAutomationTrack() + AutomationTrack * globalAutomationTrack() { return m_globalAutomationTrack; } @@ -262,7 +262,7 @@ private: void restoreControllerStates( const QDomElement & _this ); - automationTrack * m_globalAutomationTrack; + AutomationTrack * m_globalAutomationTrack; IntModel m_tempoModel; MeterModel m_timeSigModel; diff --git a/include/surround_area.h b/include/surround_area.h index 6e1774728..16b5822e1 100644 --- a/include/surround_area.h +++ b/include/surround_area.h @@ -69,8 +69,8 @@ public: m_posY.addJournalEntryFromOldToCurVal(); } -// automationPattern * automationPatternX(); -// automationPattern * automationPatternY(); +// AutomationPattern * automationPatternX(); +// AutomationPattern * automationPatternY(); private: diff --git a/include/track_container.h b/include/track_container.h index 9640dd2f2..82c41464b 100644 --- a/include/track_container.h +++ b/include/track_container.h @@ -32,7 +32,7 @@ #include "JournallingObject.h" -class automationPattern; +class AutomationPattern; class InstrumentTrack; class trackContainerView; @@ -51,7 +51,7 @@ public: virtual void loadSettings( const QDomElement & _this ); - virtual automationPattern * tempoAutomationPattern() + virtual AutomationPattern * tempoAutomationPattern() { return NULL; } diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp index 80134fecf..dd539df00 100644 --- a/plugins/flp_import/FlpImport.cpp +++ b/plugins/flp_import/FlpImport.cpp @@ -30,7 +30,7 @@ #include "FlpImport.h" #include "note_play_handle.h" -#include "automation_pattern.h" +#include "AutomationPattern.h" #include "basic_filters.h" #include "bb_track.h" #include "bb_track_container.h" @@ -1614,7 +1614,7 @@ if( scale ) value = m->minValue() + value * ( m->maxValue() - m->minValue() ); } -automationPattern * p = automationPattern::globalAutomationPattern( m ); +AutomationPattern * p = AutomationPattern::globalAutomationPattern( m ); p->putValue( jt->pos, value, false ); } } diff --git a/plugins/ladspa_effect/LadspaEffect.cpp b/plugins/ladspa_effect/LadspaEffect.cpp index 01bc60d5d..dcfe4118f 100644 --- a/plugins/ladspa_effect/LadspaEffect.cpp +++ b/plugins/ladspa_effect/LadspaEffect.cpp @@ -2,7 +2,7 @@ * LadspaEffect.cpp - class for processing LADSPA effects * * Copyright (c) 2006-2008 Danny McRae - * Copyright (c) 2009 Tobias Doerffel + * Copyright (c) 2009-2010 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -35,7 +35,7 @@ #include "LadspaSubPluginFeatures.h" #include "mixer.h" #include "EffectChain.h" -#include "automation_pattern.h" +#include "AutomationPattern.h" #include "ControllerConnection.h" #include "embed.cpp" @@ -122,10 +122,10 @@ void LadspaEffect::changeSampleRate() // the IDs of re-created controls have been saved and now need to be // resolved again - automationPattern::resolveAllIDs(); + AutomationPattern::resolveAllIDs(); // make sure, connections are ok - ControllerConnection::finalizeConnections(); + ControllerConnection::finalizeConnections(); } @@ -485,7 +485,7 @@ void LadspaEffect::pluginInstantiation() { port_desc_t * pp = m_ports.at( proc ).at( port ); if( !manager->connectPort( m_key, - m_handles[proc], + m_handles[proc], port, pp->buffer ) ) { diff --git a/plugins/midi_import/MidiImport.cpp b/plugins/midi_import/MidiImport.cpp index c909d7d78..f69fa4b48 100644 --- a/plugins/midi_import/MidiImport.cpp +++ b/plugins/midi_import/MidiImport.cpp @@ -32,8 +32,8 @@ #include "MidiImport.h" #include "track_container.h" #include "InstrumentTrack.h" -#include "automation_track.h" -#include "automation_pattern.h" +#include "AutomationTrack.h" +#include "AutomationPattern.h" #include "config_mgr.h" #include "pattern.h" #include "Instrument.h" @@ -150,15 +150,15 @@ public: lastPos( 0 ) { } - automationTrack * at; - automationPattern * ap; + AutomationTrack * at; + AutomationPattern * ap; midiTime lastPos; smfMidiCC & create( trackContainer * _tc ) { if( !at ) { - at = dynamic_cast( + at = dynamic_cast( track::create( track::AutomationTrack, _tc ) ); } return *this; @@ -178,7 +178,7 @@ public: if( !ap || time > lastPos + DefaultTicksPerTact ) { midiTime pPos = midiTime( time.getTact(), 0 ); - ap = dynamic_cast( + ap = dynamic_cast( at->createTCO(0) ); ap->movePosition( pPos ); } @@ -287,10 +287,10 @@ bool MidiImport::readSMF( trackContainer * _tc ) smfMidiChannel chs[256]; MeterModel & timeSigMM = engine::getSong()->getTimeSigModel(); - automationPattern * timeSigNumeratorPat = - automationPattern::globalAutomationPattern( &timeSigMM.numeratorModel() ); - automationPattern * timeSigDenominatorPat = - automationPattern::globalAutomationPattern( &timeSigMM.denominatorModel() ); + AutomationPattern * timeSigNumeratorPat = + AutomationPattern::globalAutomationPattern( &timeSigMM.numeratorModel() ); + AutomationPattern * timeSigDenominatorPat = + AutomationPattern::globalAutomationPattern( &timeSigMM.denominatorModel() ); // TODO: adjust these to Time.Sig changes double beatsPerTact = 4; @@ -318,7 +318,7 @@ bool MidiImport::readSMF( trackContainer * _tc ) pd.setValue( 2 ); // Tempo stuff - automationPattern * tap = _tc->tempoAutomationPattern(); + AutomationPattern * tap = _tc->tempoAutomationPattern(); if( tap ) { tap->clear(); diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index cca5996bb..607385c49 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -25,7 +25,7 @@ #include #include "AutomatableModel.h" -#include "automation_pattern.h" +#include "AutomationPattern.h" #include "ControllerConnection.h" @@ -81,7 +81,7 @@ AutomatableModel::~AutomatableModel() bool AutomatableModel::isAutomated() const { - return automationPattern::isAutomated( this ); + return AutomationPattern::isAutomated( this ); } @@ -128,13 +128,13 @@ void AutomatableModel::loadSettings( const QDomElement & _this, const QString & _name ) { // compat code - QDomNode node = _this.namedItem( automationPattern::classNodeName() ); + QDomNode node = _this.namedItem( AutomationPattern::classNodeName() ); if( node.isElement() ) { node = node.namedItem( _name ); if( node.isElement() ) { - automationPattern * p = automationPattern:: + AutomationPattern * p = AutomationPattern:: globalAutomationPattern( this ); p->loadSettings( node.toElement() ); setValue( p->valueAt( 0 ) ); diff --git a/src/core/automation_pattern.cpp b/src/core/AutomationPattern.cpp similarity index 78% rename from src/core/automation_pattern.cpp rename to src/core/AutomationPattern.cpp index b5ff646d9..f6ee0c096 100644 --- a/src/core/automation_pattern.cpp +++ b/src/core/AutomationPattern.cpp @@ -1,10 +1,10 @@ /* - * automation_pattern.cpp - implementation of class automationPattern which - * holds dynamic values + * AutomationPattern.cpp - implementation of class AutomationPattern which + * holds dynamic values * - * Copyright (c) 2008-2009 Tobias Doerffel + * Copyright (c) 2008-2010 Tobias Doerffel * Copyright (c) 2006-2008 Javier Serrano Polo - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -24,22 +24,21 @@ * */ - #include #include #include -#include "automation_pattern.h" -#include "automation_pattern_view.h" -#include "automation_editor.h" -#include "automation_track.h" +#include "AutomationPattern.h" +#include "AutomationPatternView.h" +#include "AutomationEditor.h" +#include "AutomationTrack.h" #include "ProjectJournal.h" #include "bb_track_container.h" #include "song.h" -automationPattern::automationPattern( automationTrack * _auto_track ) : +AutomationPattern::AutomationPattern( AutomationTrack * _auto_track ) : trackContentObject( _auto_track ), m_autoTrack( _auto_track ), m_objects(), @@ -52,7 +51,7 @@ automationPattern::automationPattern( automationTrack * _auto_track ) : -automationPattern::automationPattern( const automationPattern & _pat_to_copy ) : +AutomationPattern::AutomationPattern( const AutomationPattern & _pat_to_copy ) : trackContentObject( _pat_to_copy.m_autoTrack ), m_autoTrack( _pat_to_copy.m_autoTrack ), m_objects( _pat_to_copy.m_objects ), @@ -68,19 +67,19 @@ automationPattern::automationPattern( const automationPattern & _pat_to_copy ) : -automationPattern::~automationPattern() +AutomationPattern::~AutomationPattern() { - if( engine::getAutomationEditor() && - engine::getAutomationEditor()->currentPattern() == this ) + if( engine::automationEditor() && + engine::automationEditor()->currentPattern() == this ) { - engine::getAutomationEditor()->setCurrentPattern( NULL ); + engine::automationEditor()->setCurrentPattern( NULL ); } } -void automationPattern::addObject( AutomatableModel * _obj, bool _search_dup ) +void AutomationPattern::addObject( AutomatableModel * _obj, bool _search_dup ) { bool addIt = true; @@ -117,7 +116,7 @@ void automationPattern::addObject( AutomatableModel * _obj, bool _search_dup ) -const AutomatableModel * automationPattern::firstObject() const +const AutomatableModel * AutomationPattern::firstObject() const { AutomatableModel * m; if( !m_objects.isEmpty() && ( m = m_objects.first() ) != NULL ) @@ -134,7 +133,7 @@ const AutomatableModel * automationPattern::firstObject() const //TODO: Improve this -midiTime automationPattern::length() const +midiTime AutomationPattern::length() const { tick_t max_length = 0; @@ -149,13 +148,13 @@ midiTime automationPattern::length() const -midiTime automationPattern::putValue( const midiTime & _time, +midiTime AutomationPattern::putValue( const midiTime & _time, const float _value, const bool _quant_pos ) { - midiTime newTime = _quant_pos && engine::getAutomationEditor() ? + midiTime newTime = _quant_pos && engine::automationEditor() ? note::quantized( _time, - engine::getAutomationEditor()->quantization() ) : + engine::automationEditor()->quantization() ) : _time; m_timeMap[newTime] = _value; @@ -213,7 +212,7 @@ midiTime automationPattern::putValue( const midiTime & _time, -void automationPattern::removeValue( const midiTime & _time ) +void AutomationPattern::removeValue( const midiTime & _time ) { if( _time != 0 ) { @@ -255,7 +254,7 @@ void automationPattern::removeValue( const midiTime & _time ) -float automationPattern::valueAt( const midiTime & _time ) const +float AutomationPattern::valueAt( const midiTime & _time ) const { if( m_timeMap.isEmpty() ) { @@ -270,7 +269,7 @@ float automationPattern::valueAt( const midiTime & _time ) const -void automationPattern::saveSettings( QDomDocument & _doc, QDomElement & _this ) +void AutomationPattern::saveSettings( QDomDocument & _doc, QDomElement & _this ) { _this.setAttribute( "pos", startPosition() ); _this.setAttribute( "len", trackContentObject::length() ); @@ -300,7 +299,7 @@ void automationPattern::saveSettings( QDomDocument & _doc, QDomElement & _this ) -void automationPattern::loadSettings( const QDomElement & _this ) +void AutomationPattern::loadSettings( const QDomElement & _this ) { clear(); @@ -349,7 +348,7 @@ void automationPattern::loadSettings( const QDomElement & _this ) -const QString automationPattern::name() const +const QString AutomationPattern::name() const { if( !trackContentObject::name().isEmpty() ) { @@ -365,7 +364,7 @@ const QString automationPattern::name() const -void automationPattern::processMidiTime( const midiTime & _time ) +void AutomationPattern::processMidiTime( const midiTime & _time ) { if( _time >= 0 && m_hasAutomation ) { @@ -386,16 +385,16 @@ void automationPattern::processMidiTime( const midiTime & _time ) -trackContentObjectView * automationPattern::createView( trackView * _tv ) +trackContentObjectView * AutomationPattern::createView( trackView * _tv ) { - return new automationPatternView( this, _tv ); + return new AutomationPatternView( this, _tv ); } -bool automationPattern::isAutomated( const AutomatableModel * _m ) +bool AutomationPattern::isAutomated( const AutomatableModel * _m ) { trackContainer::trackList l = engine::getSong()->tracks() + engine::getBBTrackContainer()->tracks(); @@ -410,9 +409,8 @@ bool automationPattern::isAutomated( const AutomatableModel * _m ) for( track::tcoVector::const_iterator j = v.begin(); j != v.end(); ++j ) { - const automationPattern * a = - dynamic_cast( *j ); + const AutomationPattern * a = + dynamic_cast( *j ); if( a && a->m_hasAutomation ) { for( objectVector::const_iterator k = a->m_objects.begin(); @@ -434,19 +432,18 @@ bool automationPattern::isAutomated( const AutomatableModel * _m ) -automationPattern * automationPattern::globalAutomationPattern( +AutomationPattern * AutomationPattern::globalAutomationPattern( AutomatableModel * _m ) { - automationTrack * t = engine::getSong()->globalAutomationTrack(); + AutomationTrack * t = engine::getSong()->globalAutomationTrack(); track::tcoVector v = t->getTCOs(); for( track::tcoVector::const_iterator j = v.begin(); j != v.end(); ++j ) { - automationPattern * a = dynamic_cast( *j ); + AutomationPattern * a = dynamic_cast( *j ); if( a ) { - for( objectVector::const_iterator k = - a->m_objects.begin(); - k != a->m_objects.end(); ++k ) + for( objectVector::const_iterator k = a->m_objects.begin(); + k != a->m_objects.end(); ++k ) { if( *k == _m ) { @@ -456,7 +453,7 @@ automationPattern * automationPattern::globalAutomationPattern( } } - automationPattern * a = new automationPattern( t ); + AutomationPattern * a = new AutomationPattern( t ); a->addObject( _m, false ); return a; } @@ -464,7 +461,7 @@ automationPattern * automationPattern::globalAutomationPattern( -void automationPattern::resolveAllIDs() +void AutomationPattern::resolveAllIDs() { trackContainer::trackList l = engine::getSong()->tracks() + engine::getBBTrackContainer()->tracks(); @@ -479,8 +476,7 @@ void automationPattern::resolveAllIDs() for( track::tcoVector::iterator j = v.begin(); j != v.end(); ++j ) { - automationPattern * a = - dynamic_cast( *j ); + AutomationPattern * a = dynamic_cast( *j ); if( a ) { for( QVector::Iterator k = a->m_idsToResolve.begin(); @@ -504,33 +500,33 @@ void automationPattern::resolveAllIDs() -void automationPattern::clear() +void AutomationPattern::clear() { const float val = firstObject()->value(); m_timeMap.clear(); putValue( 0, val ); - if( engine::getAutomationEditor() && - engine::getAutomationEditor()->currentPattern() == this ) + if( engine::automationEditor() && + engine::automationEditor()->currentPattern() == this ) { - engine::getAutomationEditor()->update(); + engine::automationEditor()->update(); } } -void automationPattern::openInAutomationEditor() +void AutomationPattern::openInAutomationEditor() { - engine::getAutomationEditor()->setCurrentPattern( this ); - engine::getAutomationEditor()->parentWidget()->show(); - engine::getAutomationEditor()->setFocus(); + engine::automationEditor()->setCurrentPattern( this ); + engine::automationEditor()->parentWidget()->show(); + engine::automationEditor()->setFocus(); } -void automationPattern::objectDestroyed( jo_id_t _id ) +void AutomationPattern::objectDestroyed( jo_id_t _id ) { // TODO: distict between temporary removal (e.g. LADSPA controls // when switching samplerate) and real deletions because in the latter @@ -542,5 +538,5 @@ void automationPattern::objectDestroyed( jo_id_t _id ) -#include "moc_automation_pattern.cxx" +#include "moc_AutomationPattern.cxx" diff --git a/src/core/inline_automation.cpp b/src/core/InlineAutomation.cpp similarity index 70% rename from src/core/inline_automation.cpp rename to src/core/InlineAutomation.cpp index da85a139d..58d570dc8 100644 --- a/src/core/inline_automation.cpp +++ b/src/core/InlineAutomation.cpp @@ -1,8 +1,8 @@ /* - * inline_automation.cpp - class for automating something "inline" + * InlineAutomation.cpp - class for automating something "inline" + * + * Copyright (c) 2008-2010 Tobias Doerffel * - * Copyright (c) 2008 Tobias Doerffel - * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -22,21 +22,20 @@ * */ - #include -#include "inline_automation.h" +#include "InlineAutomation.h" -void inlineAutomation::saveSettings( QDomDocument & _doc, +void InlineAutomation::saveSettings( QDomDocument & _doc, QDomElement & _parent ) { if( hasAutomation() ) { QDomElement ap = _doc.createElement( - automationPattern::classNodeName() ); + AutomationPattern::classNodeName() ); QDomElement v = _doc.createElement( nodeName() ); - getAutomationPattern()->saveSettings( _doc, v ); + automationPattern()->saveSettings( _doc, v ); ap.appendChild( v ); _parent.appendChild( ap ); } @@ -45,15 +44,15 @@ void inlineAutomation::saveSettings( QDomDocument & _doc, -void inlineAutomation::loadSettings( const QDomElement & _this ) +void InlineAutomation::loadSettings( const QDomElement & _this ) { - QDomNode node = _this.namedItem( automationPattern::classNodeName() ); + QDomNode node = _this.namedItem( AutomationPattern::classNodeName() ); if( node.isElement() ) { node = node.namedItem( nodeName() ); if( node.isElement() ) { - getAutomationPattern()->loadSettings( + automationPattern()->loadSettings( node.toElement() ); } } diff --git a/src/core/engine.cpp b/src/core/engine.cpp index ebc352011..1affe4912 100644 --- a/src/core/engine.cpp +++ b/src/core/engine.cpp @@ -26,7 +26,7 @@ #include "engine.h" -#include "automation_editor.h" +#include "AutomationEditor.h" #include "bb_editor.h" #include "bb_track_container.h" #include "config_mgr.h" @@ -57,7 +57,7 @@ MainWindow * engine::s_mainWindow = NULL; bbTrackContainer * engine::s_bbTrackContainer = NULL; song * engine::s_song = NULL; songEditor * engine::s_songEditor = NULL; -automationEditor * engine::s_automationEditor = NULL; +AutomationEditor * engine::s_automationEditor = NULL; bbEditor * engine::s_bbEditor = NULL; pianoRoll * engine::s_pianoRoll = NULL; projectNotes * engine::s_projectNotes = NULL; @@ -97,7 +97,7 @@ void engine::init( const bool _has_gui ) s_projectNotes = new projectNotes; s_bbEditor = new bbEditor( s_bbTrackContainer ); s_pianoRoll = new pianoRoll; - s_automationEditor = new automationEditor; + s_automationEditor = new AutomationEditor; s_mainWindow->finalize(); } diff --git a/src/core/note.cpp b/src/core/note.cpp index 1759da9d9..2088e1188 100644 --- a/src/core/note.cpp +++ b/src/core/note.cpp @@ -28,7 +28,7 @@ #include #include "note.h" -#include "detuning_helper.h" +#include "DetuningHelper.h" #include "templates.h" @@ -37,7 +37,7 @@ note::note( const midiTime & _length, const midiTime & _pos, int _key, volume_t _volume, panning_t _panning, - detuningHelper * _detuning ) : + DetuningHelper * _detuning ) : m_selected( false ), m_oldKey( tLimit( _key, 0, NumKeys ) ), m_oldPos( _pos ), @@ -261,7 +261,7 @@ void note::redoStep( journalEntry & _je ) void note::editDetuningPattern() { - m_detuning->getAutomationPattern()->openInAutomationEditor(); + m_detuning->automationPattern()->openInAutomationEditor(); } @@ -269,8 +269,8 @@ void note::editDetuningPattern() void note::createDetuning() { - m_detuning = new detuningHelper; - (void) m_detuning->getAutomationPattern(); + m_detuning = new DetuningHelper; + (void) m_detuning->automationPattern(); m_detuning->setRange( -MaxDetuning, MaxDetuning, 0.1f ); } diff --git a/src/core/note_play_handle.cpp b/src/core/note_play_handle.cpp index ecda32aa2..39e687787 100644 --- a/src/core/note_play_handle.cpp +++ b/src/core/note_play_handle.cpp @@ -2,7 +2,7 @@ * note_play_handle.cpp - implementation of class notePlayHandle, part of * rendering engine * - * Copyright (c) 2004-2009 Tobias Doerffel + * Copyright (c) 2004-2010 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -26,7 +26,7 @@ #include "note_play_handle.h" #include "basic_filters.h" #include "config_mgr.h" -#include "detuning_helper.h" +#include "DetuningHelper.h" #include "InstrumentSoundShaping.h" #include "InstrumentTrack.h" #include "MidiPort.h" @@ -34,9 +34,9 @@ inline notePlayHandle::baseDetuning::baseDetuning( - detuningHelper * _detuning ) : + DetuningHelper * _detuning ) : m_detuning( _detuning ), - m_value( m_detuning->getAutomationPattern()->valueAt( 0 ) ) + m_value( m_detuning->automationPattern()->valueAt( 0 ) ) { } @@ -490,7 +490,7 @@ void notePlayHandle::processMidiTime( const midiTime & _time ) { if( _time >= pos() ) { - const float v = detuning()->getAutomationPattern()-> + const float v = detuning()->automationPattern()-> valueAt( _time - pos() ); if( !typeInfo::isEqual( v, m_baseDetuning->value() ) ) { diff --git a/src/core/song.cpp b/src/core/song.cpp index c1d9df19b..cc99d3c20 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -31,8 +31,8 @@ #include #include "song.h" -#include "automation_track.h" -#include "automation_editor.h" +#include "AutomationTrack.h" +#include "AutomationEditor.h" #include "bb_editor.h" #include "bb_track.h" #include "bb_track_container.h" @@ -68,7 +68,7 @@ tick_t midiTime::s_ticksPerTact = DefaultTicksPerTact; song::song() : trackContainer(), - m_globalAutomationTrack( dynamic_cast( + m_globalAutomationTrack( dynamic_cast( track::create( track::HiddenAutomationTrack, this ) ) ), m_tempoModel( DefaultTempo, MinTempo, MaxTempo, this, tr( "Tempo" ) ), @@ -708,9 +708,9 @@ bpm_t song::getTempo() -automationPattern * song::tempoAutomationPattern() +AutomationPattern * song::tempoAutomationPattern() { - return automationPattern::globalAutomationPattern( &m_tempoModel ); + return AutomationPattern::globalAutomationPattern( &m_tempoModel ); } @@ -744,14 +744,15 @@ void song::clearProject() engine::fxMixer()->clear(); - if( engine::getAutomationEditor() ) + if( engine::automationEditor() ) { - engine::getAutomationEditor()->setCurrentPattern( NULL ); + engine::automationEditor()->setCurrentPattern( NULL ); } - automationPattern::globalAutomationPattern( &m_tempoModel )->clear(); - automationPattern::globalAutomationPattern( &m_masterVolumeModel )-> + + AutomationPattern::globalAutomationPattern( &m_tempoModel )->clear(); + AutomationPattern::globalAutomationPattern( &m_masterVolumeModel )-> clear(); - automationPattern::globalAutomationPattern( &m_masterPitchModel )-> + AutomationPattern::globalAutomationPattern( &m_masterPitchModel )-> clear(); engine::getMixer()->unlock(); @@ -933,10 +934,10 @@ void song::loadProject( const QString & _file_name ) node.toElement() ); } else if( node.nodeName() == - engine::getAutomationEditor()-> + engine::automationEditor()-> nodeName() ) { - engine::getAutomationEditor()-> + engine::automationEditor()-> restoreState( node.toElement() ); } else if( node.nodeName() == @@ -968,7 +969,7 @@ void song::loadProject( const QString & _file_name ) ControllerConnection::finalizeConnections(); // resolve all IDs so that autoModels are automated - automationPattern::resolveAllIDs(); + AutomationPattern::resolveAllIDs(); engine::getMixer()->unlock(); @@ -1012,7 +1013,7 @@ bool song::saveProject() { engine::getControllerRackView()->saveState( mmp, mmp.content() ); engine::getPianoRoll()->saveState( mmp, mmp.content() ); - engine::getAutomationEditor()->saveState( mmp, mmp.content() ); + engine::automationEditor()->saveState( mmp, mmp.content() ); engine::getProjectNotes()-> SerializingObject::saveState( mmp, mmp.content() ); m_playPos[Mode_PlaySong].m_timeLine->saveState( diff --git a/src/core/track.cpp b/src/core/track.cpp index 47c87a293..38370f5a4 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -47,8 +47,8 @@ #include -#include "automation_pattern.h" -#include "automation_track.h" +#include "AutomationPattern.h" +#include "AutomationTrack.h" #include "bb_editor.h" #include "bb_track.h" #include "bb_track_container.h" @@ -493,8 +493,8 @@ void trackContentObjectView::dropEvent( QDropEvent * _de ) // the user doesn't expect... midiTime pos = m_tco->startPosition(); m_tco->restoreState( mmp.content().firstChild().toElement() ); - m_tco->movePosition( pos ); - automationPattern::resolveAllIDs(); + m_tco->movePosition( pos ); + AutomationPattern::resolveAllIDs(); _de->accept(); } } @@ -1143,7 +1143,7 @@ void trackContentWidget::dropEvent( QDropEvent * _de ) tco->restoreState( mmp.content().firstChild().toElement() ); tco->movePosition( pos ); - automationPattern::resolveAllIDs(); + AutomationPattern::resolveAllIDs(); _de->accept(); } @@ -1595,9 +1595,9 @@ track * track::create( TrackTypes _tt, trackContainer * _tc ) case SampleTrack: t = new sampleTrack( _tc ); break; // case EVENT_TRACK: // case VIDEO_TRACK: - case AutomationTrack: t = new automationTrack( _tc ); break; + case AutomationTrack: t = new ::AutomationTrack( _tc ); break; case HiddenAutomationTrack: - t = new automationTrack( _tc, true ); break; + t = new ::AutomationTrack( _tc, true ); break; default: break; } diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp index c1dea1bc8..7395ca161 100644 --- a/src/gui/AutomatableModelView.cpp +++ b/src/gui/AutomatableModelView.cpp @@ -27,7 +27,7 @@ #include #include "AutomatableModelView.h" -#include "automation_pattern.h" +#include "AutomationPattern.h" #include "ControllerConnectionDialog.h" #include "ControllerConnection.h" #include "embed.h" @@ -237,7 +237,7 @@ void AutomatableModelViewSlots::removeConnection() void AutomatableModelViewSlots::editSongGlobalAutomation() { - automationPattern::globalAutomationPattern( amv->modelUntyped() )-> + AutomationPattern::globalAutomationPattern( amv->modelUntyped() )-> openInAutomationEditor(); } diff --git a/src/gui/automation_editor.cpp b/src/gui/AutomationEditor.cpp similarity index 95% rename from src/gui/automation_editor.cpp rename to src/gui/AutomationEditor.cpp index b26b89db8..67919d470 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/AutomationEditor.cpp @@ -1,6 +1,6 @@ /* - * automation_editor.cpp - implementation of automationEditor which is used for - * actual setting of dynamic values + * AutomationEditor.cpp - implementation of AutomationEditor which is used for + * actual setting of dynamic values * * Copyright (c) 2008 Tobias Doerffel * Copyright (c) 2006-2008 Javier Serrano Polo @@ -24,7 +24,7 @@ * */ -#include "automation_editor.h" +#include "AutomationEditor.h" #include #include @@ -64,13 +64,13 @@ -QPixmap * automationEditor::s_toolDraw = NULL; -QPixmap * automationEditor::s_toolErase = NULL; -QPixmap * automationEditor::s_toolSelect = NULL; -QPixmap * automationEditor::s_toolMove = NULL; +QPixmap * AutomationEditor::s_toolDraw = NULL; +QPixmap * AutomationEditor::s_toolErase = NULL; +QPixmap * AutomationEditor::s_toolSelect = NULL; +QPixmap * AutomationEditor::s_toolMove = NULL; -automationEditor::automationEditor() : +AutomationEditor::AutomationEditor() : QWidget(), m_zoomingXModel(), m_zoomingYModel(), @@ -376,7 +376,7 @@ automationEditor::automationEditor() : -automationEditor::~automationEditor() +AutomationEditor::~AutomationEditor() { m_zoomingXModel.disconnect(); m_zoomingYModel.disconnect(); @@ -385,7 +385,7 @@ automationEditor::~automationEditor() -void automationEditor::setCurrentPattern( automationPattern * _new_pattern ) +void AutomationEditor::setCurrentPattern( AutomationPattern * _new_pattern ) { m_patternMutex.lock(); m_pattern = _new_pattern; @@ -397,7 +397,7 @@ void automationEditor::setCurrentPattern( automationPattern * _new_pattern ) -void automationEditor::saveSettings( QDomDocument & _doc, QDomElement & _this ) +void AutomationEditor::saveSettings( QDomDocument & _doc, QDomElement & _this ) { MainWindow::saveWidgetState( this, _this ); } @@ -405,7 +405,7 @@ void automationEditor::saveSettings( QDomDocument & _doc, QDomElement & _this ) -void automationEditor::loadSettings( const QDomElement & _this ) +void AutomationEditor::loadSettings( const QDomElement & _this ) { MainWindow::restoreWidgetState( this, _this ); } @@ -413,7 +413,7 @@ void automationEditor::loadSettings( const QDomElement & _this ) -void automationEditor::updateAfterPatternChange() +void AutomationEditor::updateAfterPatternChange() { QMutexLocker m( &m_patternMutex ); @@ -445,7 +445,7 @@ void automationEditor::updateAfterPatternChange() -void automationEditor::update() +void AutomationEditor::update() { QWidget::update(); @@ -460,7 +460,7 @@ void automationEditor::update() -inline void automationEditor::drawValueRect( QPainter & _p, +inline void AutomationEditor::drawValueRect( QPainter & _p, int _x, int _y, int _width, int _height, const bool _is_selected ) @@ -482,7 +482,7 @@ inline void automationEditor::drawValueRect( QPainter & _p, -void automationEditor::removeSelection() +void AutomationEditor::removeSelection() { m_selectStartTick = 0; m_selectedTick = 0; @@ -493,7 +493,7 @@ void automationEditor::removeSelection() -void automationEditor::closeEvent( QCloseEvent * _ce ) +void AutomationEditor::closeEvent( QCloseEvent * _ce ) { QApplication::restoreOverrideCursor(); if( parentWidget() ) @@ -510,7 +510,7 @@ void automationEditor::closeEvent( QCloseEvent * _ce ) -void automationEditor::keyPressEvent( QKeyEvent * _ke ) +void AutomationEditor::keyPressEvent( QKeyEvent * _ke ) { switch( _ke->key() ) { @@ -659,7 +659,7 @@ void automationEditor::keyPressEvent( QKeyEvent * _ke ) -void automationEditor::leaveEvent( QEvent * _e ) +void AutomationEditor::leaveEvent( QEvent * _e ) { while( QApplication::overrideCursor() != NULL ) { @@ -670,7 +670,7 @@ void automationEditor::leaveEvent( QEvent * _e ) } -void automationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 ) +void AutomationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 ) { int deltax = qRound( qAbs( _x1 - _x0 ) ); float deltay = qAbs( _y1 - _y0 ); @@ -721,7 +721,7 @@ void automationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 ) -void automationEditor::mousePressEvent( QMouseEvent * _me ) +void AutomationEditor::mousePressEvent( QMouseEvent * _me ) { QMutexLocker m( &m_patternMutex ); if( !validPattern() ) @@ -872,7 +872,7 @@ void automationEditor::mousePressEvent( QMouseEvent * _me ) -void automationEditor::mouseReleaseEvent( QMouseEvent * _me ) +void AutomationEditor::mouseReleaseEvent( QMouseEvent * _me ) { m_action = NONE; @@ -885,7 +885,7 @@ void automationEditor::mouseReleaseEvent( QMouseEvent * _me ) -void automationEditor::mouseMoveEvent( QMouseEvent * _me ) +void AutomationEditor::mouseMoveEvent( QMouseEvent * _me ) { QMutexLocker m( &m_patternMutex ); if( !validPattern() ) @@ -1240,7 +1240,7 @@ void automationEditor::mouseMoveEvent( QMouseEvent * _me ) -inline void automationEditor::drawCross( QPainter & _p ) +inline void AutomationEditor::drawCross( QPainter & _p ) { QPoint mouse_pos = mapFromGlobal( QCursor::pos() ); float level = getLevel( mouse_pos.y() ); @@ -1260,7 +1260,7 @@ inline void automationEditor::drawCross( QPainter & _p ) -void automationEditor::paintEvent( QPaintEvent * _pe ) +void AutomationEditor::paintEvent( QPaintEvent * _pe ) { QMutexLocker m( &m_patternMutex ); @@ -1601,7 +1601,7 @@ void automationEditor::paintEvent( QPaintEvent * _pe ) // responsible for moving/resizing scrollbars after window-resizing -void automationEditor::resizeEvent( QResizeEvent * ) +void AutomationEditor::resizeEvent( QResizeEvent * ) { m_leftRightScroll->setGeometry( VALUES_WIDTH, height() - SCROLLBAR_SIZE, width() - VALUES_WIDTH, @@ -1643,7 +1643,7 @@ void automationEditor::resizeEvent( QResizeEvent * ) -void automationEditor::wheelEvent( QWheelEvent * _we ) +void AutomationEditor::wheelEvent( QWheelEvent * _we ) { _we->accept(); if( _we->modifiers() & Qt::ControlModifier ) @@ -1682,7 +1682,7 @@ void automationEditor::wheelEvent( QWheelEvent * _we ) -float automationEditor::getLevel( int _y ) +float AutomationEditor::getLevel( int _y ) { int level_line_y = height() - SCROLLBAR_SIZE - 1; // pressed level @@ -1706,7 +1706,7 @@ float automationEditor::getLevel( int _y ) -inline bool automationEditor::inBBEditor() +inline bool AutomationEditor::inBBEditor() { QMutexLocker m( &m_patternMutex ); return( validPattern() && @@ -1717,7 +1717,7 @@ inline bool automationEditor::inBBEditor() -void automationEditor::play() +void AutomationEditor::play() { QMutexLocker m( &m_patternMutex ); @@ -1793,7 +1793,7 @@ void automationEditor::play() -void automationEditor::stop() +void AutomationEditor::stop() { QMutexLocker m( &m_patternMutex ); @@ -1817,7 +1817,7 @@ void automationEditor::stop() -void automationEditor::horScrolled( int _new_pos ) +void AutomationEditor::horScrolled( int _new_pos ) { m_currentPosition = _new_pos; emit positionChanged( m_currentPosition ); @@ -1827,7 +1827,7 @@ void automationEditor::horScrolled( int _new_pos ) -void automationEditor::verScrolled( int _new_pos ) +void AutomationEditor::verScrolled( int _new_pos ) { m_scrollLevel = _new_pos; updateTopBottomLevels(); @@ -1837,7 +1837,7 @@ void automationEditor::verScrolled( int _new_pos ) -void automationEditor::drawButtonToggled() +void AutomationEditor::drawButtonToggled() { m_editMode = DRAW; removeSelection(); @@ -1847,7 +1847,7 @@ void automationEditor::drawButtonToggled() -void automationEditor::eraseButtonToggled() +void AutomationEditor::eraseButtonToggled() { m_editMode = ERASE; removeSelection(); @@ -1857,7 +1857,7 @@ void automationEditor::eraseButtonToggled() -void automationEditor::selectButtonToggled() +void AutomationEditor::selectButtonToggled() { m_editMode = SELECT; removeSelection(); @@ -1867,7 +1867,7 @@ void automationEditor::selectButtonToggled() -void automationEditor::moveButtonToggled() +void AutomationEditor::moveButtonToggled() { m_editMode = MOVE; m_selValuesForMove.clear(); @@ -1878,7 +1878,7 @@ void automationEditor::moveButtonToggled() -void automationEditor::selectAll() +void AutomationEditor::selectAll() { QMutexLocker m( &m_patternMutex ); if( !validPattern() ) @@ -1917,7 +1917,7 @@ void automationEditor::selectAll() // returns vector with pointers to all selected values -void automationEditor::getSelectedValues( timeMap & _selected_values ) +void AutomationEditor::getSelectedValues( timeMap & _selected_values ) { QMutexLocker m( &m_patternMutex ); if( !validPattern() ) @@ -1962,7 +1962,7 @@ void automationEditor::getSelectedValues( timeMap & _selected_values ) -void automationEditor::copySelectedValues() +void AutomationEditor::copySelectedValues() { m_valuesToCopy.clear(); @@ -1986,7 +1986,7 @@ void automationEditor::copySelectedValues() -void automationEditor::cutSelectedValues() +void AutomationEditor::cutSelectedValues() { QMutexLocker m( &m_patternMutex ); if( !validPattern() ) @@ -2018,7 +2018,7 @@ void automationEditor::cutSelectedValues() -void automationEditor::pasteValues() +void AutomationEditor::pasteValues() { QMutexLocker m( &m_patternMutex ); if( validPattern() && !m_valuesToCopy.isEmpty() ) @@ -2041,7 +2041,7 @@ void automationEditor::pasteValues() -void automationEditor::deleteSelectedValues() +void AutomationEditor::deleteSelectedValues() { QMutexLocker m( &m_patternMutex ); if( !validPattern() ) @@ -2071,7 +2071,7 @@ void automationEditor::deleteSelectedValues() -void automationEditor::updatePosition( const midiTime & _t ) +void AutomationEditor::updatePosition( const midiTime & _t ) { if( ( engine::getSong()->isPlaying() && engine::getSong()->playMode() == @@ -2098,7 +2098,7 @@ void automationEditor::updatePosition( const midiTime & _t ) -void automationEditor::zoomingXChanged() +void AutomationEditor::zoomingXChanged() { const QString & zfac = m_zoomingXModel.currentText(); m_ppt = zfac.left( zfac.length() - 1 ).toInt() * DEFAULT_PPT / 100; @@ -2112,7 +2112,7 @@ void automationEditor::zoomingXChanged() -void automationEditor::zoomingYChanged() +void AutomationEditor::zoomingYChanged() { const QString & zfac = m_zoomingYModel.currentText(); m_y_auto = zfac == "Auto"; @@ -2130,7 +2130,7 @@ void automationEditor::zoomingYChanged() -int automationEditor::quantization() const +int AutomationEditor::quantization() const { return( DefaultTicksPerTact / m_quantizeComboBox->model()->currentText().right( @@ -2141,7 +2141,7 @@ int automationEditor::quantization() const -void automationEditor::updateTopBottomLevels() +void AutomationEditor::updateTopBottomLevels() { if( m_y_auto ) { @@ -2188,6 +2188,6 @@ void automationEditor::updateTopBottomLevels() -#include "moc_automation_editor.cxx" +#include "moc_AutomationEditor.cxx" diff --git a/src/gui/automation_pattern_view.cpp b/src/gui/AutomationPatternView.cpp similarity index 85% rename from src/gui/automation_pattern_view.cpp rename to src/gui/AutomationPatternView.cpp index 03a6fc7c5..bc8db5c87 100644 --- a/src/gui/automation_pattern_view.cpp +++ b/src/gui/AutomationPatternView.cpp @@ -1,8 +1,8 @@ /* - * automation_pattern_view.cpp - implementation of view for automationPattern + * AutomationPatternView.cpp - implementation of view for AutomationPattern + * + * Copyright (c) 2008-2010 Tobias Doerffel * - * Copyright (c) 2008-2009 Tobias Doerffel - * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -22,14 +22,13 @@ * */ - #include #include #include -#include "automation_pattern_view.h" -#include "automation_editor.h" -#include "automation_pattern.h" +#include "AutomationPatternView.h" +#include "AutomationEditor.h" +#include "AutomationPattern.h" #include "embed.h" #include "engine.h" #include "gui_templates.h" @@ -40,7 +39,7 @@ -automationPatternView::automationPatternView( automationPattern * _pattern, +AutomationPatternView::AutomationPatternView( AutomationPattern * _pattern, trackView * _parent ) : trackContentObjectView( _pattern, _parent ), m_pat( _pattern ), @@ -61,7 +60,7 @@ automationPatternView::automationPatternView( automationPattern * _pattern, -automationPatternView::~automationPatternView() +AutomationPatternView::~AutomationPatternView() { } @@ -69,7 +68,7 @@ automationPatternView::~automationPatternView() -void automationPatternView::update() +void AutomationPatternView::update() { m_needsUpdate = true; if( fixedTCOs() ) @@ -82,7 +81,7 @@ void automationPatternView::update() -void automationPatternView::resetName() +void AutomationPatternView::resetName() { m_pat->setName( QString::null ); } @@ -90,7 +89,7 @@ void automationPatternView::resetName() -void automationPatternView::changeName() +void AutomationPatternView::changeName() { QString s = m_pat->name(); renameDialog rename_dlg( s ); @@ -102,7 +101,7 @@ void automationPatternView::changeName() -void automationPatternView::disconnectObject( QAction * _a ) +void AutomationPatternView::disconnectObject( QAction * _a ) { JournallingObject * j = engine::projectJournal()-> journallingObject( _a->data().toInt() ); @@ -118,7 +117,7 @@ void automationPatternView::disconnectObject( QAction * _a ) -void automationPatternView::constructContextMenu( QMenu * _cm ) +void AutomationPatternView::constructContextMenu( QMenu * _cm ) { QAction * a = new QAction( embed::getIconPixmap( "automation" ), tr( "Open in Automation editor" ), _cm ); @@ -143,7 +142,7 @@ void automationPatternView::constructContextMenu( QMenu * _cm ) _cm->addSeparator(); QMenu * m = new QMenu( tr( "%1 Connections" ). arg( m_pat->m_objects.count() ), _cm ); - for( automationPattern::objectVector::iterator it = + for( AutomationPattern::objectVector::iterator it = m_pat->m_objects.begin(); it != m_pat->m_objects.end(); ++it ) { @@ -166,7 +165,7 @@ void automationPatternView::constructContextMenu( QMenu * _cm ) -void automationPatternView::mouseDoubleClickEvent( QMouseEvent * _me ) +void AutomationPatternView::mouseDoubleClickEvent( QMouseEvent * _me ) { if( _me->button() != Qt::LeftButton ) { @@ -179,7 +178,7 @@ void automationPatternView::mouseDoubleClickEvent( QMouseEvent * _me ) -void automationPatternView::paintEvent( QPaintEvent * ) +void AutomationPatternView::paintEvent( QPaintEvent * ) { if( m_needsUpdate == false ) { @@ -242,7 +241,7 @@ void automationPatternView::paintEvent( QPaintEvent * ) lin2grad.setColorAt( 1, cl ); lin2grad.setColorAt( 0, cd ); - for( automationPattern::timeMap::const_iterator it = + for( AutomationPattern::timeMap::const_iterator it = m_pat->getTimeMap().begin(); it != m_pat->getTimeMap().end(); ++it ) { @@ -291,7 +290,7 @@ void automationPatternView::paintEvent( QPaintEvent * ) -void automationPatternView::dragEnterEvent( QDragEnterEvent * _dee ) +void AutomationPatternView::dragEnterEvent( QDragEnterEvent * _dee ) { stringPairDrag::processDragEnterEvent( _dee, "automatable_model" ); if( !_dee->isAccepted() ) @@ -303,7 +302,7 @@ void automationPatternView::dragEnterEvent( QDragEnterEvent * _dee ) -void automationPatternView::dropEvent( QDropEvent * _de ) +void AutomationPatternView::dropEvent( QDropEvent * _de ) { QString type = stringPairDrag::decodeKey( _de ); QString val = stringPairDrag::decodeValue( _de ); @@ -318,12 +317,10 @@ void automationPatternView::dropEvent( QDropEvent * _de ) } update(); - if( engine::getAutomationEditor() && - engine::getAutomationEditor()->currentPattern() == - m_pat ) + if( engine::automationEditor() && + engine::automationEditor()->currentPattern() == m_pat ) { - engine::getAutomationEditor()->setCurrentPattern( - m_pat ); + engine::automationEditor()->setCurrentPattern( m_pat ); } } else @@ -335,5 +332,5 @@ void automationPatternView::dropEvent( QDropEvent * _de ) -#include "moc_automation_pattern_view.cxx" +#include "moc_AutomationPatternView.cxx" diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 1bbafc0ce..81e6d92c0 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -60,7 +60,7 @@ #include "ToolPlugin.h" #include "tool_button.h" #include "ProjectJournal.h" -#include "automation_editor.h" +#include "AutomationEditor.h" #include "templates.h" @@ -856,7 +856,7 @@ void MainWindow::togglePianoRollWin( void ) void MainWindow::toggleAutomationEditorWin( void ) { - toggleWindow( engine::getAutomationEditor() ); + toggleWindow( engine::automationEditor() ); } diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index 0f3095c1e..12b726c4b 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -49,7 +49,7 @@ #include "Clipboard.h" #include "combobox.h" #include "debug.h" -#include "detuning_helper.h" +#include "DetuningHelper.h" #include "embed.h" #include "gui_templates.h" #include "InstrumentTrack.h" @@ -68,7 +68,7 @@ #include "tooltip.h" -typedef automationPattern::timeMap timeMap; +typedef AutomationPattern::timeMap timeMap; extern Keys whiteKeys[]; // defined in piano_widget.cpp @@ -721,7 +721,7 @@ inline void pianoRoll::drawDetuningInfo( QPainter & _p, note * _n, int _x, int middle_y = _y + KEY_LINE_HEIGHT / 2; _p.setPen( QColor( 0xFF, 0xDF, 0x20 ) ); - timeMap & map = _n->detuning()->getAutomationPattern()->getTimeMap(); + timeMap & map = _n->detuning()->automationPattern()->getTimeMap(); for( timeMap::ConstIterator it = map.begin(); it != map.end(); ++it ) { Sint32 pos_ticks = it.key(); diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp index 053f57c26..e71e98d81 100644 --- a/src/gui/widgets/combobox.cpp +++ b/src/gui/widgets/combobox.cpp @@ -1,8 +1,9 @@ /* * combobox.cpp - implementation of LMMS-combobox * - * Copyright (c) 2006-2009 Tobias Doerffel - * + * Copyright (c) 2006-2010 Tobias Doerffel + * Copyright (c) 2008-2009 Paul Giblock + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -33,7 +34,6 @@ #include #include -#include "automation_pattern.h" #include "caption_menu.h" #include "engine.h" #include "embed.h" diff --git a/src/tracks/automation_track.cpp b/src/tracks/AutomationTrack.cpp similarity index 72% rename from src/tracks/automation_track.cpp rename to src/tracks/AutomationTrack.cpp index 82fa48fbf..67ca77379 100644 --- a/src/tracks/automation_track.cpp +++ b/src/tracks/AutomationTrack.cpp @@ -1,10 +1,10 @@ /* - * automation_track.cpp - automationTrack handles automation of objects without - * a track + * AutomationTrack.cpp - AutomationTrack handles automation of objects without + * a track * - * Copyright (c) 2008 Tobias Doerffel + * Copyright (c) 2008-2010 Tobias Doerffel * Copyright (c) 2006-2008 Javier Serrano Polo - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -24,9 +24,8 @@ * */ - -#include "automation_track.h" -#include "automation_pattern.h" +#include "AutomationTrack.h" +#include "AutomationPattern.h" #include "engine.h" #include "embed.h" #include "ProjectJournal.h" @@ -35,8 +34,8 @@ #include "track_label_button.h" -automationTrack::automationTrack( trackContainer * _tc, bool _hidden ) : - track( _hidden ? HiddenAutomationTrack : AutomationTrack, _tc ) +AutomationTrack::AutomationTrack( trackContainer * _tc, bool _hidden ) : + track( _hidden ? HiddenAutomationTrack : track::AutomationTrack, _tc ) { setName( tr( "Automation track" ) ); } @@ -44,14 +43,14 @@ automationTrack::automationTrack( trackContainer * _tc, bool _hidden ) : -automationTrack::~automationTrack() +AutomationTrack::~AutomationTrack() { } -bool automationTrack::play( const midiTime & _start, const fpp_t _frames, +bool AutomationTrack::play( const midiTime & _start, const fpp_t _frames, const f_cnt_t _frame_base, Sint16 _tco_num ) { if( isMuted() ) @@ -73,8 +72,7 @@ bool automationTrack::play( const midiTime & _start, const fpp_t _frames, for( tcoVector::iterator it = tcos.begin(); it != tcos.end(); ++it ) { - automationPattern * p = - dynamic_cast( *it ); + AutomationPattern * p = dynamic_cast( *it ); if( p == NULL || ( *it )->isMuted() ) { continue; @@ -92,23 +90,23 @@ bool automationTrack::play( const midiTime & _start, const fpp_t _frames, -trackView * automationTrack::createView( trackContainerView * _tcv ) +trackView * AutomationTrack::createView( trackContainerView * _tcv ) { - return new automationTrackView( this, _tcv ); + return new AutomationTrackView( this, _tcv ); } -trackContentObject * automationTrack::createTCO( const midiTime & ) +trackContentObject * AutomationTrack::createTCO( const midiTime & ) { - return new automationPattern( this ); + return new AutomationPattern( this ); } -void automationTrack::saveTrackSpecificSettings( QDomDocument & _doc, +void AutomationTrack::saveTrackSpecificSettings( QDomDocument & _doc, QDomElement & _this ) { } @@ -116,7 +114,7 @@ void automationTrack::saveTrackSpecificSettings( QDomDocument & _doc, -void automationTrack::loadTrackSpecificSettings( const QDomElement & _this ) +void AutomationTrack::loadTrackSpecificSettings( const QDomElement & _this ) { // just in case something somehow wrent wrong... if( type() == HiddenAutomationTrack ) @@ -129,7 +127,7 @@ void automationTrack::loadTrackSpecificSettings( const QDomElement & _this ) -automationTrackView::automationTrackView( automationTrack * _at, +AutomationTrackView::AutomationTrackView( AutomationTrack * _at, trackContainerView * _tcv ) : trackView( _at, _tcv ) { @@ -145,14 +143,14 @@ automationTrackView::automationTrackView( automationTrack * _at, -automationTrackView::~automationTrackView() +AutomationTrackView::~AutomationTrackView() { } -void automationTrackView::dragEnterEvent( QDragEnterEvent * _dee ) +void AutomationTrackView::dragEnterEvent( QDragEnterEvent * _dee ) { stringPairDrag::processDragEnterEvent( _dee, "automatable_model" ); } @@ -160,7 +158,7 @@ void automationTrackView::dragEnterEvent( QDragEnterEvent * _dee ) -void automationTrackView::dropEvent( QDropEvent * _de ) +void AutomationTrackView::dropEvent( QDropEvent * _de ) { QString type = stringPairDrag::decodeKey( _de ); QString val = stringPairDrag::decodeValue( _de ); @@ -185,8 +183,7 @@ void automationTrackView::dropEvent( QDropEvent * _de ) } trackContentObject * tco = getTrack()->createTCO( pos ); - automationPattern * pat = - dynamic_cast( tco ); + AutomationPattern * pat = dynamic_cast( tco ); pat->addObject( mod ); pat->movePosition( pos ); } diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index f63dcb9e2..fbc20123c 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -40,7 +40,7 @@ #include "InstrumentTrack.h" #include "AudioPort.h" -#include "automation_pattern.h" +#include "AutomationPattern.h" #include "bb_track.h" #include "config_mgr.h" #include "ControllerConnection.h" @@ -813,7 +813,7 @@ void InstrumentTrack::loadTrackSpecificSettings( const QDomElement & _this ) // compat code - if node-name doesn't match any known // one, we assume that it is an instrument-plugin // which we'll try to load - else if( automationPattern::classNodeName() != node.nodeName() && + else if( AutomationPattern::classNodeName() != node.nodeName() && ControllerConnection::classNodeName() != node.nodeName() && !node.toElement().hasAttribute( "id" ) ) {