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

Rename MidiTime to TimePos (#5684)

Browse Source 
Fixes #4866
This commit is contained in:
Alexandre Almeida
2020-11-29 15:46:13 -03:00
committed by GitHub
parent a2e71c81de
commit 6e081265ba
82 changed files with 622 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/AutomatableModel.h
View File

@@ -30,7 +30,7 @@
#include "JournallingObject.h"
#include "Model.h"
#include "MidiTime.h"
#include "TimePos.h"
#include "ValueBuffer.h"
#include "MemoryManager.h"
#include "ModelVisitor.h"
@@ -281,7 +281,7 @@ public:
return false;
}
float globalAutomationValueAt( const MidiTime& time );
float globalAutomationValueAt( const TimePos& time );
void setStrictStepSize( const bool b )
{

8
include/AutomationEditor.h
View File

@@ -34,7 +34,7 @@
#include "lmms_basics.h"
#include "JournallingObject.h"
#include "MidiTime.h"
#include "TimePos.h"
#include "AutomationPattern.h"
#include "ComboBoxModel.h"
#include "Knob.h"
@@ -153,7 +153,7 @@ protected slots:
void pasteValues();
void deleteSelectedValues();
void updatePosition( const MidiTime & t );
void updatePosition( const TimePos & t );
void zoomingXChanged();
void zoomingYChanged();
@@ -215,7 +215,7 @@ private:
QScrollBar * m_leftRightScroll;
QScrollBar * m_topBottomScroll;
MidiTime m_currentPosition;
TimePos m_currentPosition;
Actions m_action;
@@ -265,7 +265,7 @@ private:
signals:
void currentPatternChanged();
void positionChanged( const MidiTime & );
void positionChanged( const TimePos & );
} ;

16
include/AutomationPattern.h
View File

@@ -34,7 +34,7 @@
class AutomationTrack;
class MidiTime;
class TimePos;
@@ -74,19 +74,19 @@ public:
}
void setTension( QString _new_tension );
MidiTime timeMapLength() const;
TimePos timeMapLength() const;
void updateLength();
MidiTime putValue( const MidiTime & time,
TimePos putValue( const TimePos & time,
const float value,
const bool quantPos = true,
const bool ignoreSurroundingPoints = true );
void removeValue( const MidiTime & time );
void removeValue( const TimePos & time );
void recordValue(MidiTime time, float value);
void recordValue(TimePos time, float value);
MidiTime setDragValue( const MidiTime & time,
TimePos setDragValue( const TimePos & time,
const float value,
const bool quantPos = true,
const bool controlKey = false );
@@ -134,8 +134,8 @@ public:
return m_timeMap.isEmpty() == false;
}
float valueAt( const MidiTime & _time ) const;
float *valuesAfter( const MidiTime & _time ) const;
float valueAt( const TimePos & _time ) const;
float *valuesAfter( const TimePos & _time ) const;
const QString name() const;

4
include/AutomationTrack.h
View File

@@ -37,7 +37,7 @@ public:
AutomationTrack( TrackContainer* tc, bool _hidden = false );
virtual ~AutomationTrack() = default;
virtual bool play( const MidiTime & _start, const fpp_t _frames,
virtual bool play( const TimePos & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 ) override;
QString nodeName() const override
@@ -46,7 +46,7 @@ public:
}
TrackView * createView( TrackContainerView* ) override;
TrackContentObject* createTCO(const MidiTime & pos) override;
TrackContentObject* createTCO(const TimePos & pos) override;
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent ) override;

4
include/BBTrack.h
View File

@@ -103,10 +103,10 @@ public:
BBTrack( TrackContainer* tc );
virtual ~BBTrack();
virtual bool play( const MidiTime & _start, const fpp_t _frames,
virtual bool play( const TimePos & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 ) override;
TrackView * createView( TrackContainerView* tcv ) override;
TrackContentObject* createTCO(const MidiTime & pos) override;
TrackContentObject* createTCO(const TimePos & pos) override;
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent ) override;

4
include/BBTrackContainer.h
View File

@@ -38,7 +38,7 @@ public:
BBTrackContainer();
virtual ~BBTrackContainer();
virtual bool play( MidiTime _start, const fpp_t _frames,
virtual bool play( TimePos _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
void updateAfterTrackAdd() override;
@@ -62,7 +62,7 @@ public:
void fixIncorrectPositions();
void createTCOsForBB( int _bb );
AutomatedValueMap automatedValuesAt(MidiTime time, int tcoNum) const override;
AutomatedValueMap automatedValuesAt(TimePos time, int tcoNum) const override;
public slots:
void play();

4
include/Instrument.h
View File

@@ -30,8 +30,8 @@
#include "lmms_export.h"
#include "lmms_basics.h"
#include "MemoryManager.h"
#include "MidiTime.h"
#include "Plugin.h"
#include "TimePos.h"
// forward-declarations
@@ -105,7 +105,7 @@ public:
// sub-classes can re-implement this for receiving all incoming
// MIDI-events
inline virtual bool handleMidiEvent( const MidiEvent&, const MidiTime& = MidiTime(), f_cnt_t offset = 0 )
inline virtual bool handleMidiEvent( const MidiEvent&, const TimePos& = TimePos(), f_cnt_t offset = 0 )
{
return true;
}

8
include/InstrumentTrack.h
View File

@@ -80,8 +80,8 @@ public:
MidiEvent applyMasterKey( const MidiEvent& event );
void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) override;
void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) override;
void processInEvent( const MidiEvent& event, const TimePos& time = TimePos(), f_cnt_t offset = 0 ) override;
void processOutEvent( const MidiEvent& event, const TimePos& time = TimePos(), f_cnt_t offset = 0 ) override;
// silence all running notes played by this track
void silenceAllNotes( bool removeIPH = false );
@@ -130,13 +130,13 @@ public:
}
// play everything in given frame-range - creates note-play-handles
virtual bool play( const MidiTime & _start, const fpp_t _frames,
virtual bool play( const TimePos & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 ) override;
// create new view for me
TrackView * createView( TrackContainerView* tcv ) override;
// create new track-content-object = pattern
TrackContentObject* createTCO(const MidiTime & pos) override;
TrackContentObject* createTCO(const TimePos & pos) override;
// called by track

2
include/Lv2ControlBase.h
View File

@@ -134,7 +134,7 @@ protected:
QString nodeName() const { return "lv2controls"; }
bool hasNoteInput() const;
void handleMidiInputEvent(const class MidiEvent &event,
const class MidiTime &time, f_cnt_t offset);
const class TimePos &time, f_cnt_t offset);
private:
//! Return the DataFile settings type

4
include/Lv2Proc.h
View File

@@ -37,10 +37,10 @@
#include "Lv2Features.h"
#include "LinkedModelGroups.h"
#include "MidiEvent.h"
#include "MidiTime.h"
#include "Plugin.h"
#include "PluginIssue.h"
#include "../src/3rdparty/ringbuffer/include/ringbuffer/ringbuffer.h"
#include "TimePos.h"
// forward declare port structs/enums
namespace Lv2Ports
@@ -144,7 +144,7 @@ public:
void run(fpp_t frames);
void handleMidiInputEvent(const class MidiEvent &event,
const MidiTime &time, f_cnt_t offset);
const TimePos &time, f_cnt_t offset);
/*
misc

2
include/MidiAlsaSeq.h
View File

@@ -66,7 +66,7 @@ public:
virtual void processOutEvent( const MidiEvent & _me,
const MidiTime & _time,
const TimePos & _time,
const MidiPort * _port ) override;
void applyPortMode( MidiPort * _port ) override;

2
include/MidiApple.h
View File

@@ -60,7 +60,7 @@ public:
}
virtual void processOutEvent( const MidiEvent & _me,
const MidiTime & _time,
const TimePos & _time,
const MidiPort * _port );
virtual void applyPortMode( MidiPort * _port );

4
include/MidiClient.h
View File

@@ -46,7 +46,7 @@ public:
// to be implemented by sub-classes
virtual void processOutEvent( const MidiEvent & _me,
const MidiTime & _time,
const TimePos & _time,
const MidiPort * _port ) = 0;
// inheriting classes can re-implement this for being able to update
@@ -141,7 +141,7 @@ protected:
private:
// this does MIDI-event-process
void processParsedEvent();
void processOutEvent( const MidiEvent& event, const MidiTime& time, const MidiPort* port ) override;
void processOutEvent( const MidiEvent& event, const TimePos& time, const MidiPort* port ) override;
// small helper function returning length of a certain event - this
// is necessary for parsing raw-MIDI-data

4
include/MidiController.h
View File

@@ -44,10 +44,10 @@ public:
virtual ~MidiController();
virtual void processInEvent( const MidiEvent & _me,
const MidiTime & _time, f_cnt_t offset = 0 ) override;
const TimePos & _time, f_cnt_t offset = 0 ) override;
virtual void processOutEvent( const MidiEvent& _me,
const MidiTime & _time, f_cnt_t offset = 0 ) override
const TimePos & _time, f_cnt_t offset = 0 ) override
{
// No output yet
}

6
include/MidiEventProcessor.h
View File

@@ -26,8 +26,8 @@
#define MIDI_EVENT_PROCESSOR_H
#include "MidiEvent.h"
#include "MidiTime.h"
#include "MemoryManager.h"
#include "TimePos.h"
// all classes being able to process MIDI-events should inherit from this
class MidiEventProcessor
@@ -43,8 +43,8 @@ public:
}
// to be implemented by inheriting classes
virtual void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) = 0;
virtual void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) = 0;
virtual void processInEvent( const MidiEvent& event, const TimePos& time = TimePos(), f_cnt_t offset = 0 ) = 0;
virtual void processOutEvent( const MidiEvent& event, const TimePos& time = TimePos(), f_cnt_t offset = 0 ) = 0;
} ;

6
include/MidiPort.h
View File

@@ -31,7 +31,7 @@
#include <QtCore/QMap>
#include "Midi.h"
#include "MidiTime.h"
#include "TimePos.h"
#include "AutomatableModel.h"
@@ -102,8 +102,8 @@ public:
return outputChannel() ? outputChannel() - 1 : 0;
}
void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime() );
void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime() );
void processInEvent( const MidiEvent& event, const TimePos& time = TimePos() );
void processOutEvent( const MidiEvent& event, const TimePos& time = TimePos() );
void saveSettings( QDomDocument& doc, QDomElement& thisElement ) override;

2
include/MidiWinMM.h
View File

@@ -64,7 +64,7 @@ public:
virtual void processOutEvent( const MidiEvent & _me,
const MidiTime & _time,
const TimePos & _time,
const MidiPort * _port );
virtual void applyPortMode( MidiPort * _port );

36
include/Note.h
View File

@@ -30,8 +30,8 @@
#include "volume.h"
#include "panning.h"
#include "MidiTime.h"
#include "SerializingObject.h"
#include "TimePos.h"
class DetuningHelper;
@@ -81,8 +81,8 @@ const float MaxDetuning = 4 * 12.0f;
class LMMS_EXPORT Note : public SerializingObject
{
public:
Note( const MidiTime & length = MidiTime( 0 ),
const MidiTime & pos = MidiTime( 0 ),
Note( const TimePos & length = TimePos( 0 ),
const TimePos & pos = TimePos( 0 ),
int key = DefaultKey,
volume_t volume = DefaultVolume,
panning_t panning = DefaultPanning,
@@ -93,9 +93,9 @@ public:
// used by GUI
inline void setSelected( const bool selected ) { m_selected = selected; }
inline void setOldKey( const int oldKey ) { m_oldKey = oldKey; }
inline void setOldPos( const MidiTime & oldPos ) { m_oldPos = oldPos; }
inline void setOldPos( const TimePos & oldPos ) { m_oldPos = oldPos; }
inline void setOldLength( const MidiTime & oldLength )
inline void setOldLength( const TimePos & oldLength )
{
m_oldLength = oldLength;
}
@@ -105,8 +105,8 @@ public:
}
void setLength( const MidiTime & length );
void setPos( const MidiTime & pos );
void setLength( const TimePos & length );
void setPos( const TimePos & pos );
void setKey( const int key );
virtual void setVolume( volume_t volume );
virtual void setPanning( panning_t panning );
@@ -138,12 +138,12 @@ public:
return m_oldKey;
}
inline MidiTime oldPos() const
inline TimePos oldPos() const
{
return m_oldPos;
}
inline MidiTime oldLength() const
inline TimePos oldLength() const
{
return m_oldLength;
}
@@ -153,23 +153,23 @@ public:
return m_isPlaying;
}
inline MidiTime endPos() const
inline TimePos endPos() const
{
const int l = length();
return pos() + l;
}
inline const MidiTime & length() const
inline const TimePos & length() const
{
return m_length;
}
inline const MidiTime & pos() const
inline const TimePos & pos() const
{
return m_pos;
}
inline MidiTime pos( MidiTime basePos ) const
inline TimePos pos( TimePos basePos ) const
{
const int bp = basePos;
return m_pos - bp;
@@ -205,7 +205,7 @@ public:
return classNodeName();
}
static MidiTime quantized( const MidiTime & m, const int qGrid );
static TimePos quantized( const TimePos & m, const int qGrid );
DetuningHelper * detuning() const
{
@@ -226,15 +226,15 @@ private:
// for piano roll editing
bool m_selected;
int m_oldKey;
MidiTime m_oldPos;
MidiTime m_oldLength;
TimePos m_oldPos;
TimePos m_oldLength;
bool m_isPlaying;
int m_key;
volume_t m_volume;
panning_t m_panning;
MidiTime m_length;
MidiTime m_pos;
TimePos m_length;
TimePos m_pos;
DetuningHelper * m_detuning;
};

8
include/NotePlayHandle.h
View File

@@ -244,19 +244,19 @@ public:
}
/*! Process note detuning automation */
void processMidiTime( const MidiTime& time );
void processTimePos( const TimePos& time );
/*! Updates total length (m_frames) depending on a new tempo */
void resize( const bpm_t newTempo );
/*! Set song-global offset (relative to containing pattern) in order to properly perform the note detuning */
void setSongGlobalParentOffset( const MidiTime& offset )
void setSongGlobalParentOffset( const TimePos& offset )
{
m_songGlobalParentOffset = offset;
}
/*! Returns song-global offset */
const MidiTime& songGlobalParentOffset() const
const TimePos& songGlobalParentOffset() const
{
return m_songGlobalParentOffset;
}
@@ -323,7 +323,7 @@ private:
float m_unpitchedFrequency;
BaseDetuning* m_baseDetuning;
MidiTime m_songGlobalParentOffset;
TimePos m_songGlobalParentOffset;
int m_midiChannel;
Origin m_origin;

2
include/Pattern.h
View File

@@ -128,7 +128,7 @@ protected slots:
private:
MidiTime beatPatternLength() const;
TimePos beatPatternLength() const;
void setType( PatternTypes _new_pattern_type );
void checkType();

18
include/PianoRoll.h
View File

@@ -187,9 +187,9 @@ protected slots:
void pasteNotes();
bool deleteSelectedNotes();
void updatePosition(const MidiTime & t );
void updatePositionAccompany(const MidiTime & t );
void updatePositionStepRecording(const MidiTime & t );
void updatePosition(const TimePos & t );
void updatePositionAccompany(const TimePos & t );
void updatePositionStepRecording(const TimePos & t );
void zoomingChanged();
void zoomingYChanged();
@@ -266,9 +266,9 @@ private:
PianoRoll( const PianoRoll & );
virtual ~PianoRoll();
void autoScroll(const MidiTime & t );
void autoScroll(const TimePos & t );
MidiTime newNoteLen() const;
TimePos newNoteLen() const;
void shiftPos(int amount);
void shiftPos(NoteVector notes, int amount);
@@ -331,7 +331,7 @@ private:
QScrollBar * m_leftRightScroll;
QScrollBar * m_topBottomScroll;
MidiTime m_currentPosition;
TimePos m_currentPosition;
bool m_recording;
QList<Note> m_recordingNotes;
@@ -377,12 +377,12 @@ private:
// remember these values to use them
// for the next note that is set
MidiTime m_lenOfNewNotes;
TimePos m_lenOfNewNotes;
volume_t m_lastNoteVolume;
panning_t m_lastNotePanning;
//When resizing several notes, we want to calculate a common minimum length
MidiTime m_minResizeLen;
TimePos m_minResizeLen;
int m_startKey; // first key when drawing
int m_lastKey;
@@ -447,7 +447,7 @@ private:
QBrush m_blackKeyInactiveBackground;
signals:
void positionChanged( const MidiTime & );
void positionChanged( const TimePos & );
} ;

4
include/SampleRecordHandle.h
View File

@@ -29,8 +29,8 @@
#include <QtCore/QList>
#include <QtCore/QPair>
#include "MidiTime.h"
#include "PlayHandle.h"
#include "TimePos.h"
class BBTrack;
class SampleBuffer;
@@ -60,7 +60,7 @@ private:
typedef QList<QPair<sampleFrame *, f_cnt_t> > bufferList;
bufferList m_buffers;
f_cnt_t m_framesRecorded;
MidiTime m_minLength;
TimePos m_minLength;
Track * m_track;
BBTrack * m_bbTrack;

8
include/SampleTrack.h
View File

@@ -50,7 +50,7 @@ public:
SampleTCO( Track * _track );
virtual ~SampleTCO();
void changeLength( const MidiTime & _length ) override;
void changeLength( const TimePos & _length ) override;
const QString & sampleFile() const;
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
@@ -65,7 +65,7 @@ public:
return m_sampleBuffer;
}
MidiTime sampleLength() const;
TimePos sampleLength() const;
void setSampleStartFrame( f_cnt_t startFrame );
void setSamplePlayLength( f_cnt_t length );
TrackContentObjectView * createView( TrackView * _tv ) override;
@@ -139,10 +139,10 @@ public:
SampleTrack( TrackContainer* tc );
virtual ~SampleTrack();
virtual bool play( const MidiTime & _start, const fpp_t _frames,
virtual bool play( const TimePos & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 ) override;
TrackView * createView( TrackContainerView* tcv ) override;
TrackContentObject* createTCO(const MidiTime & pos) override;
TrackContentObject* createTCO(const TimePos & pos) override;
virtual void saveTrackSpecificSettings( QDomDocument & _doc,

36
include/Song.h
View File

@@ -81,11 +81,11 @@ public:
bool hasErrors();
QString errorSummary();
class PlayPos : public MidiTime
class PlayPos : public TimePos
{
public:
PlayPos( const int abs = 0 ) :
MidiTime( abs ),
TimePos( abs ),
m_timeLine( NULL ),
m_currentFrame( 0.0f )
{
@@ -131,27 +131,27 @@ public:
return m_elapsedMilliSeconds[playMode];
}
inline void setToTime(MidiTime const & midiTime)
inline void setToTime(TimePos const & pos)
{
m_elapsedMilliSeconds[m_playMode] = midiTime.getTimeInMilliseconds(getTempo());
m_playPos[m_playMode].setTicks(midiTime.getTicks());
m_elapsedMilliSeconds[m_playMode] = pos.getTimeInMilliseconds(getTempo());
m_playPos[m_playMode].setTicks(pos.getTicks());
}
inline void setToTime(MidiTime const & midiTime, PlayModes playMode)
inline void setToTime(TimePos const & pos, PlayModes playMode)
{
m_elapsedMilliSeconds[playMode] = midiTime.getTimeInMilliseconds(getTempo());
m_playPos[playMode].setTicks(midiTime.getTicks());
m_elapsedMilliSeconds[playMode] = pos.getTimeInMilliseconds(getTempo());
m_playPos[playMode].setTicks(pos.getTicks());
}
inline void setToTimeByTicks(tick_t ticks)
{
m_elapsedMilliSeconds[m_playMode] = MidiTime::ticksToMilliseconds(ticks, getTempo());
m_elapsedMilliSeconds[m_playMode] = TimePos::ticksToMilliseconds(ticks, getTempo());
m_playPos[m_playMode].setTicks(ticks);
}
inline void setToTimeByTicks(tick_t ticks, PlayModes playMode)
{
m_elapsedMilliSeconds[playMode] = MidiTime::ticksToMilliseconds(ticks, getTempo());
m_elapsedMilliSeconds[playMode] = TimePos::ticksToMilliseconds(ticks, getTempo());
m_playPos[playMode].setTicks(ticks);
}
@@ -162,7 +162,7 @@ public:
inline int ticksPerBar() const
{
return MidiTime::ticksPerBar(m_timeSigModel);
return TimePos::ticksPerBar(m_timeSigModel);
}
// Returns the beat position inside the bar, 0-based
@@ -273,7 +273,7 @@ public:
}
//TODO: Add Q_DECL_OVERRIDE when Qt4 is dropped
AutomatedValueMap automatedValuesAt(MidiTime time, int tcoNum = -1) const override;
AutomatedValueMap automatedValuesAt(TimePos time, int tcoNum = -1) const override;
// file management
void createNewProject();
@@ -409,7 +409,7 @@ private:
void removeAllControllers();
void processAutomations(const TrackList& tracks, MidiTime timeStart, fpp_t frames);
void processAutomations(const TrackList& tracks, TimePos timeStart, fpp_t frames);
void setModified(bool value);
@@ -462,11 +462,11 @@ private:
int m_loopRenderCount;
int m_loopRenderRemaining;
MidiTime m_exportSongBegin;
MidiTime m_exportLoopBegin;
MidiTime m_exportLoopEnd;
MidiTime m_exportSongEnd;
MidiTime m_exportEffectiveLength;
TimePos m_exportSongBegin;
TimePos m_exportLoopBegin;
TimePos m_exportLoopEnd;
TimePos m_exportSongEnd;
TimePos m_exportEffectiveLength;
friend class LmmsCore;
friend class SongEditor;

4
include/SongEditor.h
View File

@@ -80,7 +80,7 @@ public slots:
void setEditModeSelect();
void toggleProportionalSnap();
void updatePosition( const MidiTime & t );
void updatePosition( const TimePos & t );
void updatePositionLine();
void selectAllTcos( bool select );
@@ -150,7 +150,7 @@ private:
QPoint m_scrollPos;
QPoint m_mousePos;
int m_rubberBandStartTrackview;
MidiTime m_rubberbandStartMidipos;
TimePos m_rubberbandStartTimePos;
int m_currentZoomingValue;
int m_trackHeadWidth;
bool m_selectRegion;

14
include/StepRecorder.h
View File

@@ -41,14 +41,14 @@ class StepRecorder : public QObject
StepRecorder(PianoRoll& pianoRoll, StepRecorderWidget& stepRecorderWidget);
void initialize();
void start(const MidiTime& currentPosition,const MidiTime& stepLength);
void start(const TimePos& currentPosition,const TimePos& stepLength);
void stop();
void notePressed(const Note & n);
void noteReleased(const Note & n);
bool keyPressEvent(QKeyEvent* ke);
bool mousePressEvent(QMouseEvent* ke);
void setCurrentPattern(Pattern* newPattern);
void setStepsLength(const MidiTime& newLength);
void setStepsLength(const TimePos& newLength);
QVector<Note*> getCurStepNotes();
@@ -73,7 +73,7 @@ class StepRecorder : public QObject
void dismissStep();
void prepareNewStep();
MidiTime getCurStepEndPos();
TimePos getCurStepEndPos();
void updateCurStepNotes();
void updateWidget();
@@ -84,11 +84,11 @@ class StepRecorder : public QObject
StepRecorderWidget& m_stepRecorderWidget;
bool m_isRecording = false;
MidiTime m_curStepStartPos = 0;
MidiTime m_curStepEndPos = 0;
TimePos m_curStepStartPos = 0;
TimePos m_curStepEndPos = 0;
MidiTime m_stepsLength;
MidiTime m_curStepLength; // current step length refers to the step currently recorded. it may defer from m_stepsLength
TimePos m_stepsLength;
TimePos m_curStepLength; // current step length refers to the step currently recorded. it may defer from m_stepsLength
// since the user can make current step larger
QTimer m_updateReleasedTimer;

20
include/StepRecorderWidget.h
View File

@@ -44,15 +44,15 @@ public:
//API used by PianoRoll
void setPixelsPerBar(int ppb);
void setCurrentPosition(MidiTime currentPosition);
void setCurrentPosition(TimePos currentPosition);
void setMargins(const QMargins &qm);
void setBottomMargin(const int marginBottom);
QMargins margins();
//API used by StepRecorder
void setStepsLength(MidiTime stepsLength);
void setStartPosition(MidiTime pos);
void setEndPosition(MidiTime pos);
void setStepsLength(TimePos stepsLength);
void setStartPosition(TimePos pos);
void setEndPosition(TimePos pos);
void showHint();
@@ -62,16 +62,16 @@ private:
int xCoordOfTick(int tick);
void drawVerLine(QPainter* painter, int x, const QColor& color, int top, int bottom);
void drawVerLine(QPainter* painter, const MidiTime& pos, const QColor& color, int top, int bottom);
void drawVerLine(QPainter* painter, const TimePos& pos, const QColor& color, int top, int bottom);
void updateBoundaries();
MidiTime m_stepsLength;
MidiTime m_curStepStartPos;
MidiTime m_curStepEndPos;
TimePos m_stepsLength;
TimePos m_curStepStartPos;
TimePos m_curStepEndPos;
int m_ppb; // pixels per bar
MidiTime m_currentPosition; // current position showed by on PianoRoll
TimePos m_currentPosition; // current position showed by on PianoRoll
QColor m_colorLineStart;
QColor m_colorLineEnd;
@@ -88,7 +88,7 @@ private:
const int m_marginRight;
signals:
void positionChanged(const MidiTime & t);
void positionChanged(const TimePos & t);
} ;
#endif //STEP_RECOREDER_WIDGET_H

26
include/TimeLineWidget.h
View File

@@ -73,7 +73,7 @@ public:
TimeLineWidget(int xoff, int yoff, float ppb, Song::PlayPos & pos,
const MidiTime & begin, Song::PlayModes mode, QWidget * parent);
const TimePos & begin, Song::PlayModes mode, QWidget * parent);
virtual ~TimeLineWidget();
inline QColor const & getBarLineColor() const { return m_barLineColor; }
@@ -123,23 +123,23 @@ public:
return m_loopPoints == LoopPointsEnabled;
}
inline const MidiTime & loopBegin() const
inline const TimePos & loopBegin() const
{
return ( m_loopPos[0] < m_loopPos[1] ) ?
m_loopPos[0] : m_loopPos[1];
}
inline const MidiTime & loopEnd() const
inline const TimePos & loopEnd() const
{
return ( m_loopPos[0] > m_loopPos[1] ) ?
m_loopPos[0] : m_loopPos[1];
}
inline void savePos( const MidiTime & pos )
inline void savePos( const TimePos & pos )
{
m_savedPos = pos;
}
inline const MidiTime & savedPos() const
inline const TimePos & savedPos() const
{
return m_savedPos;
}
@@ -162,10 +162,10 @@ public:
return "timeline";
}
inline int markerX( const MidiTime & _t ) const
inline int markerX( const TimePos & _t ) const
{
return m_xOffset + static_cast<int>( ( _t - m_begin ) *
m_ppb / MidiTime::ticksPerBar() );
m_ppb / TimePos::ticksPerBar() );
}
signals:
@@ -175,10 +175,10 @@ signals:
public slots:
void updatePosition( const MidiTime & );
void updatePosition( const TimePos & );
void updatePosition()
{
updatePosition( MidiTime() );
updatePosition( TimePos() );
}
void toggleAutoScroll( int _n );
void toggleLoopPoints( int _n );
@@ -218,11 +218,11 @@ private:
int m_posMarkerX;
float m_ppb;
Song::PlayPos & m_pos;
const MidiTime & m_begin;
const TimePos & m_begin;
const Song::PlayModes m_mode;
MidiTime m_loopPos[2];
TimePos m_loopPos[2];
MidiTime m_savedPos;
TimePos m_savedPos;
TextFloat * m_hint;
@@ -242,7 +242,7 @@ private:
signals:
void positionChanged( const MidiTime & _t );
void positionChanged( const TimePos & _t );
void loopPointStateLoaded( int _n );
void positionMarkerMoved();
void loadBehaviourAtStop( int _n );

39
include/MidiTime.h → include/TimePos.h
View File

@@ -1,6 +1,6 @@
/*
* MidiTime.h - declaration of class MidiTime which provides data type for
* position- and length-variables
* TimePos.h - declaration of class TimePos which provides data type for
* position- and length-variables
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net
*
@@ -24,8 +24,8 @@
*/
#ifndef MIDI_TIME_H
#define MIDI_TIME_H
#ifndef TIME_POS_H
#define TIME_POS_H
#include <QtGlobal>
@@ -40,13 +40,15 @@ const int DefaultBeatsPerBar = DefaultTicksPerBar / DefaultStepsPerBar;
class MeterModel;
/**
Represents a time signature, in which the numerator is the number of beats
in a bar, while the denominator is the type of note representing a beat.
Example: 6/8 means 6 beats in a bar with each beat having a duration of one 8th-note.
*/
class LMMS_EXPORT TimeSig
{
public:
// in a time signature,
// the numerator represents the number of beats in a measure.
// the denominator indicates which type of note represents a beat.
// example: 6/8 means 6 beats in a measure, where each beat has duration equal to one 8th-note.
TimeSig( int num, int denom );
TimeSig( const MeterModel &model );
int numerator() const;
@@ -57,17 +59,20 @@ private:
};
class LMMS_EXPORT MidiTime
/**
Represents a position in time or length of a note or event, in ticks, beats, and bars
*/
class LMMS_EXPORT TimePos
{
public:
MidiTime( const bar_t bar, const tick_t ticks );
MidiTime( const tick_t ticks = 0 );
TimePos( const bar_t bar, const tick_t ticks );
TimePos( const tick_t ticks = 0 );
MidiTime quantize(float) const;
MidiTime toAbsoluteBar() const;
TimePos quantize(float) const;
TimePos toAbsoluteBar() const;
MidiTime& operator+=( const MidiTime& time );
MidiTime& operator-=( const MidiTime& time );
TimePos& operator+=( const TimePos& time );
TimePos& operator-=( const TimePos& time );
// return the bar, rounded down and 0-based
bar_t getBar() const;
@@ -92,12 +97,12 @@ public:
double getTimeInMilliseconds( bpm_t beatsPerMinute ) const;
static MidiTime fromFrames( const f_cnt_t frames, const float framesPerTick );
static TimePos fromFrames( const f_cnt_t frames, const float framesPerTick );
static tick_t ticksPerBar();
static tick_t ticksPerBar( const TimeSig &sig );
static int stepsPerBar();
static void setTicksPerBar( tick_t tpt );
static MidiTime stepPosition( int step );
static TimePos stepPosition( int step );
static double ticksToMilliseconds( tick_t ticks, bpm_t beatsPerMinute );
static double ticksToMilliseconds( double ticks, bpm_t beatsPerMinute );

56
include/Track.h
View File

@@ -34,7 +34,7 @@
#include <QMimeData>
#include "lmms_basics.h"
#include "MidiTime.h"
#include "TimePos.h"
#include "Rubberband.h"
#include "JournallingObject.h"
#include "AutomatableModel.h"
@@ -108,18 +108,18 @@ public:
}
inline const MidiTime & startPosition() const
inline const TimePos & startPosition() const
{
return m_startPosition;
}
inline MidiTime endPosition() const
inline TimePos endPosition() const
{
const int sp = m_startPosition;
return sp + m_length;
}
inline const MidiTime & length() const
inline const TimePos & length() const
{
return m_length;
}
@@ -153,8 +153,8 @@ public:
return m_useCustomClipColor;
}
virtual void movePosition( const MidiTime & pos );
virtual void changeLength( const MidiTime & length );
virtual void movePosition( const TimePos & pos );
virtual void changeLength( const TimePos & length );
virtual TrackContentObjectView * createView( TrackView * tv ) = 0;
@@ -171,8 +171,8 @@ public:
/// Returns true if and only if a->startPosition() < b->startPosition()
static bool comparePosition(const TrackContentObject* a, const TrackContentObject* b);
MidiTime startTimeOffset() const;
void setStartTimeOffset( const MidiTime &startTimeOffset );
TimePos startTimeOffset() const;
void setStartTimeOffset( const TimePos &startTimeOffset );
void updateColor();
@@ -201,9 +201,9 @@ private:
Track * m_track;
QString m_name;
MidiTime m_startPosition;
MidiTime m_length;
MidiTime m_startTimeOffset;
TimePos m_startPosition;
TimePos m_length;
TimePos m_startTimeOffset;
BoolModel m_mutedModel;
BoolModel m_soloModel;
@@ -360,9 +360,9 @@ private:
Actions m_action;
QPoint m_initialMousePos;
QPoint m_initialMouseGlobalPos;
MidiTime m_initialTCOPos;
MidiTime m_initialTCOEnd;
QVector<MidiTime> m_initialOffsets;
TimePos m_initialTCOPos;
TimePos m_initialTCOEnd;
QVector<TimePos> m_initialOffsets;
TextFloat * m_hint;
@@ -389,7 +389,7 @@ private:
void setInitialOffsets();
bool mouseMovedDistance( QMouseEvent * me, int distance );
MidiTime draggedTCOPos( QMouseEvent * me );
TimePos draggedTCOPos( QMouseEvent * me );
} ;
@@ -423,12 +423,12 @@ public:
}
}
bool canPasteSelection( MidiTime tcoPos, const QDropEvent *de );
bool canPasteSelection( MidiTime tcoPos, const QMimeData *md, bool allowSameBar = false );
bool pasteSelection( MidiTime tcoPos, QDropEvent * de );
bool pasteSelection( MidiTime tcoPos, const QMimeData * md, bool skipSafetyCheck = false );
bool canPasteSelection( TimePos tcoPos, const QDropEvent *de );
bool canPasteSelection( TimePos tcoPos, const QMimeData *md, bool allowSameBar = false );
bool pasteSelection( TimePos tcoPos, QDropEvent * de );
bool pasteSelection( TimePos tcoPos, const QMimeData * md, bool skipSafetyCheck = false );
MidiTime endPosition( const MidiTime & posStart );
TimePos endPosition( const TimePos & posStart );
// qproperty access methods
@@ -444,7 +444,7 @@ public:
public slots:
void update();
void changePosition( const MidiTime & newPos = MidiTime( -1 ) );
void changePosition( const TimePos & newPos = TimePos( -1 ) );
protected:
enum ContextMenuAction
@@ -479,7 +479,7 @@ protected:
private:
Track * getTrack();
MidiTime getPosition( int mouseX );
TimePos getPosition( int mouseX );
TrackView * m_trackView;
@@ -584,12 +584,12 @@ public:
return m_type;
}
virtual bool play( const MidiTime & start, const fpp_t frames,
virtual bool play( const TimePos & start, const fpp_t frames,
const f_cnt_t frameBase, int tcoNum = -1 ) = 0;
virtual TrackView * createView( TrackContainerView * view ) = 0;
virtual TrackContentObject * createTCO( const MidiTime & pos ) = 0;
virtual TrackContentObject * createTCO( const TimePos & pos ) = 0;
virtual void saveTrackSpecificSettings( QDomDocument & doc,
QDomElement & parent ) = 0;
@@ -618,15 +618,15 @@ public:
{
return m_trackContentObjects;
}
void getTCOsInRange( tcoVector & tcoV, const MidiTime & start,
const MidiTime & end );
void getTCOsInRange( tcoVector & tcoV, const TimePos & start,
const TimePos & end );
void swapPositionOfTCOs( int tcoNum1, int tcoNum2 );
void createTCOsForBB( int bb );
void insertBar( const MidiTime & pos );
void removeBar( const MidiTime & pos );
void insertBar( const TimePos & pos );
void removeBar( const TimePos & pos );
bar_t length() const;

4
include/TrackContainer.h
View File

@@ -93,13 +93,13 @@ public:
return m_TrackContainerType;
}
virtual AutomatedValueMap automatedValuesAt(MidiTime time, int tcoNum = -1) const;
virtual AutomatedValueMap automatedValuesAt(TimePos time, int tcoNum = -1) const;
signals:
void trackAdded( Track * _track );
protected:
static AutomatedValueMap automatedValuesFromTracks(const TrackList &tracks, MidiTime timeStart, int tcoNum = -1);
static AutomatedValueMap automatedValuesFromTracks(const TrackList &tracks, TimePos timeStart, int tcoNum = -1);
mutable QReadWriteLock m_tracksMutex;

6
include/TrackContainerView.h
View File

@@ -57,7 +57,7 @@ public:
return m_scrollArea;
}
inline const MidiTime & currentPosition() const
inline const TimePos & currentPosition() const
{
return m_currentPosition;
}
@@ -143,7 +143,7 @@ protected:
void resizeEvent( QResizeEvent * ) override;
MidiTime m_currentPosition;
TimePos m_currentPosition;
private:
@@ -182,7 +182,7 @@ private:
signals:
void positionChanged( const MidiTime & _pos );
void positionChanged( const TimePos & _pos );
} ;