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

Rename TCO and related to Clip (#6226)

Browse Source 
This PR renames

    TCO -> Clip
    Pattern -> MidiClip
    *TCO and *TCOView -> *Clip and *ClipView

The savefiles are not yet modified by this PR.
This commit is contained in:
Alexandre Almeida
2022-01-14 01:45:21 -03:00
committed by GitHub
parent bf323d2024
commit 55d361fb65
135 changed files with 5163 additions and 5175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/AudioEngine.cpp
View File

@@ -463,7 +463,7 @@ void AudioEngine::handleMetronome()
Song::PlayModes currentPlayMode = song->playMode();
bool metronomeSupported =
currentPlayMode == Song::Mode_PlayPattern
currentPlayMode == Song::Mode_PlayMidiClip
|| currentPlayMode == Song::Mode_PlaySong
|| currentPlayMode == Song::Mode_PlayBB;

48
src/core/AutomatableModel.cpp
View File

@@ -27,7 +27,7 @@
#include "lmms_math.h"
#include "AudioEngine.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "ControllerConnection.h"
#include "LocaleHelper.h"
#include "ProjectJournal.h"
@@ -87,7 +87,7 @@ AutomatableModel::~AutomatableModel()
bool AutomatableModel::isAutomated() const
{
return AutomationPattern::isAutomated( this );
return AutomationClip::isAutomated( this );
}
@@ -176,13 +176,13 @@ void AutomatableModel::saveSettings( QDomDocument& doc, QDomElement& element, co
void AutomatableModel::loadSettings( const QDomElement& element, const QString& name )
{
// compat code
QDomNode node = element.namedItem( AutomationPattern::classNodeName() );
QDomNode node = element.namedItem( AutomationClip::classNodeName() );
if( node.isElement() )
{
node = node.namedItem( name );
if( node.isElement() )
{
AutomationPattern * p = AutomationPattern::globalAutomationPattern( this );
AutomationClip * p = AutomationClip::globalAutomationClip( this );
p->loadSettings( node.toElement() );
setValue( p->valueAt( 0 ) );
// in older projects we sometimes have odd automations
@@ -718,57 +718,57 @@ void AutomatableModel::reset()
float AutomatableModel::globalAutomationValueAt( const TimePos& time )
{
// get patterns that connect to this model
QVector<AutomationPattern *> patterns = AutomationPattern::patternsForModel( this );
if( patterns.isEmpty() )
// get clips that connect to this model
QVector<AutomationClip *> clips = AutomationClip::clipsForModel( this );
if( clips.isEmpty() )
{
// if no such patterns exist, return current value
// if no such clips exist, return current value
return m_value;
}
else
{
// of those patterns:
// find the patterns which overlap with the time position
QVector<AutomationPattern *> patternsInRange;
for( QVector<AutomationPattern *>::ConstIterator it = patterns.begin(); it != patterns.end(); it++ )
// of those clips:
// find the clips which overlap with the time position
QVector<AutomationClip *> clipsInRange;
for( QVector<AutomationClip *>::ConstIterator it = clips.begin(); it != clips.end(); it++ )
{
int s = ( *it )->startPosition();
int e = ( *it )->endPosition();
if( s <= time && e >= time ) { patternsInRange += ( *it ); }
if( s <= time && e >= time ) { clipsInRange += ( *it ); }
}
AutomationPattern * latestPattern = nullptr;
AutomationClip * latestClip = nullptr;
if( ! patternsInRange.isEmpty() )
if( ! clipsInRange.isEmpty() )
{
// if there are more than one overlapping patterns, just use the first one because
// multiple pattern behaviour is undefined anyway
latestPattern = patternsInRange[0];
// if there are more than one overlapping clips, just use the first one because
// multiple clip behaviour is undefined anyway
latestClip = clipsInRange[0];
}
else
// if we find no patterns at the exact time, we need to search for the last pattern before time and use that
// if we find no clips at the exact time, we need to search for the last clip before time and use that
{
int latestPosition = 0;
for( QVector<AutomationPattern *>::ConstIterator it = patterns.begin(); it != patterns.end(); it++ )
for( QVector<AutomationClip *>::ConstIterator it = clips.begin(); it != clips.end(); it++ )
{
int e = ( *it )->endPosition();
if( e <= time && e > latestPosition )
{
latestPosition = e;
latestPattern = ( *it );
latestClip = ( *it );
}
}
}
if( latestPattern )
if( latestClip )
{
// scale/fit the value appropriately and return it
const float value = latestPattern->valueAt( time - latestPattern->startPosition() );
const float value = latestClip->valueAt( time - latestClip->startPosition() );
const float scaled_value = scaledValue( value );
return fittedValue( scaled_value );
}
// if we still find no pattern, the value at that time is undefined so
// if we still find no clip, the value at that time is undefined so
// just return current value as the best we can do
else return m_value;
}

222
src/core/AutomationPattern.cpp → src/core/AutomationClip.cpp
View File

@@ -1,5 +1,5 @@
/*
* AutomationPattern.cpp - implementation of class AutomationPattern which
* AutomationClip.cpp - implementation of class AutomationClip which
* holds dynamic values
*
* Copyright (c) 2008-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -24,10 +24,10 @@
*
*/
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "AutomationNode.h"
#include "AutomationPatternView.h"
#include "AutomationClipView.h"
#include "AutomationTrack.h"
#include "BBTrackContainer.h"
#include "LocaleHelper.h"
@@ -36,14 +36,14 @@
#include <cmath>
int AutomationPattern::s_quantization = 1;
const float AutomationPattern::DEFAULT_MIN_VALUE = 0;
const float AutomationPattern::DEFAULT_MAX_VALUE = 1;
int AutomationClip::s_quantization = 1;
const float AutomationClip::DEFAULT_MIN_VALUE = 0;
const float AutomationClip::DEFAULT_MAX_VALUE = 1;
AutomationPattern::AutomationPattern( AutomationTrack * _auto_track ) :
TrackContentObject( _auto_track ),
m_patternMutex(QMutex::Recursive),
AutomationClip::AutomationClip( AutomationTrack * _auto_track ) :
Clip( _auto_track ),
m_clipMutex(QMutex::Recursive),
m_autoTrack( _auto_track ),
m_objects(),
m_tension( 1.0 ),
@@ -73,25 +73,25 @@ AutomationPattern::AutomationPattern( AutomationTrack * _auto_track ) :
AutomationPattern::AutomationPattern( const AutomationPattern & _pat_to_copy ) :
TrackContentObject( _pat_to_copy.m_autoTrack ),
m_patternMutex(QMutex::Recursive),
m_autoTrack( _pat_to_copy.m_autoTrack ),
m_objects( _pat_to_copy.m_objects ),
m_tension( _pat_to_copy.m_tension ),
m_progressionType( _pat_to_copy.m_progressionType )
AutomationClip::AutomationClip( const AutomationClip & _clip_to_copy ) :
Clip( _clip_to_copy.m_autoTrack ),
m_clipMutex(QMutex::Recursive),
m_autoTrack( _clip_to_copy.m_autoTrack ),
m_objects( _clip_to_copy.m_objects ),
m_tension( _clip_to_copy.m_tension ),
m_progressionType( _clip_to_copy.m_progressionType )
{
// Locks the mutex of the copied AutomationPattern to make sure it
// Locks the mutex of the copied AutomationClip to make sure it
// doesn't change while it's being copied
QMutexLocker m(&_pat_to_copy.m_patternMutex);
QMutexLocker m(&_clip_to_copy.m_clipMutex);
for( timeMap::const_iterator it = _pat_to_copy.m_timeMap.begin();
it != _pat_to_copy.m_timeMap.end(); ++it )
for( timeMap::const_iterator it = _clip_to_copy.m_timeMap.begin();
it != _clip_to_copy.m_timeMap.end(); ++it )
{
// Copies the automation node (in/out values and in/out tangents)
m_timeMap[POS(it)] = it.value();
// Sets the node's pattern to this one
m_timeMap[POS(it)].setPattern(this);
// Sets the node's clip to this one
m_timeMap[POS(it)].setClip(this);
}
if (!getTrack()){ return; }
switch( getTrack()->trackContainer()->type() )
@@ -108,9 +108,9 @@ AutomationPattern::AutomationPattern( const AutomationPattern & _pat_to_copy ) :
}
}
bool AutomationPattern::addObject( AutomatableModel * _obj, bool _search_dup )
bool AutomationClip::addObject( AutomatableModel * _obj, bool _search_dup )
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
if( _search_dup && m_objects.contains(_obj) )
{
@@ -138,10 +138,10 @@ bool AutomationPattern::addObject( AutomatableModel * _obj, bool _search_dup )
void AutomationPattern::setProgressionType(
void AutomationClip::setProgressionType(
ProgressionTypes _new_progression_type )
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
if ( _new_progression_type == DiscreteProgression ||
_new_progression_type == LinearProgression ||
@@ -155,9 +155,9 @@ void AutomationPattern::setProgressionType(
void AutomationPattern::setTension( QString _new_tension )
void AutomationClip::setTension( QString _new_tension )
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
bool ok;
float nt = LocaleHelper::toFloat(_new_tension, & ok);
@@ -171,9 +171,9 @@ void AutomationPattern::setTension( QString _new_tension )
const AutomatableModel * AutomationPattern::firstObject() const
const AutomatableModel * AutomationClip::firstObject() const
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
AutomatableModel* model;
if (!m_objects.isEmpty() && (model = m_objects.first()) != nullptr)
@@ -185,9 +185,9 @@ const AutomatableModel * AutomationPattern::firstObject() const
return &fm;
}
const AutomationPattern::objectVector& AutomationPattern::objects() const
const AutomationClip::objectVector& AutomationClip::objects() const
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
return m_objects;
}
@@ -195,9 +195,9 @@ const AutomationPattern::objectVector& AutomationPattern::objects() const
TimePos AutomationPattern::timeMapLength() const
TimePos AutomationClip::timeMapLength() const
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
TimePos one_bar = TimePos(1, 0);
if (m_timeMap.isEmpty()) { return one_bar; }
@@ -205,7 +205,7 @@ TimePos AutomationPattern::timeMapLength() const
timeMap::const_iterator it = m_timeMap.end();
tick_t last_tick = static_cast<tick_t>(POS(it - 1));
// if last_tick is 0 (single item at tick 0)
// return length as a whole bar to prevent disappearing TCO
// return length as a whole bar to prevent disappearing Clip
if (last_tick == 0) { return one_bar; }
return TimePos(last_tick);
@@ -214,7 +214,7 @@ TimePos AutomationPattern::timeMapLength() const
void AutomationPattern::updateLength()
void AutomationClip::updateLength()
{
// Do not resize down in case user manually extended up
changeLength(qMax(length(), timeMapLength()));
@@ -232,14 +232,14 @@ void AutomationPattern::updateLength()
* @param Boolean True to ignore unquantized surrounding nodes (defaults to true)
* @return TimePos of the recently added automation node
*/
TimePos AutomationPattern::putValue(
TimePos AutomationClip::putValue(
const TimePos & time,
const float value,
const bool quantPos,
const bool ignoreSurroundingPoints
)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
cleanObjects();
@@ -286,7 +286,7 @@ TimePos AutomationPattern::putValue(
* @param Boolean True to ignore unquantized surrounding nodes (defaults to true)
* @return TimePos of the recently added automation node
*/
TimePos AutomationPattern::putValues(
TimePos AutomationClip::putValues(
const TimePos & time,
const float inValue,
const float outValue,
@@ -294,7 +294,7 @@ TimePos AutomationPattern::putValues(
const bool ignoreSurroundingPoints
)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
cleanObjects();
@@ -331,9 +331,9 @@ TimePos AutomationPattern::putValues(
void AutomationPattern::removeNode(const TimePos & time)
void AutomationClip::removeNode(const TimePos & time)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
cleanObjects();
@@ -358,7 +358,7 @@ void AutomationPattern::removeNode(const TimePos & time)
* @param Int first tick of the range
* @param Int second tick of the range
*/
void AutomationPattern::removeNodes(const int tick0, const int tick1)
void AutomationClip::removeNodes(const int tick0, const int tick1)
{
if (tick0 == tick1)
{
@@ -393,7 +393,7 @@ void AutomationPattern::removeNodes(const int tick0, const int tick1)
* @param Int first tick of the range
* @param Int second tick of the range
*/
void AutomationPattern::resetNodes(const int tick0, const int tick1)
void AutomationClip::resetNodes(const int tick0, const int tick1)
{
if (tick0 == tick1)
{
@@ -414,9 +414,9 @@ void AutomationPattern::resetNodes(const int tick0, const int tick1)
void AutomationPattern::recordValue(TimePos time, float value)
void AutomationClip::recordValue(TimePos time, float value)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
if( value != m_lastRecordedValue )
{
@@ -442,14 +442,14 @@ void AutomationPattern::recordValue(TimePos time, float value)
* @param Boolean. True to ignore unquantized surrounding nodes
* @return TimePos with current time of the dragged value
*/
TimePos AutomationPattern::setDragValue(
TimePos AutomationClip::setDragValue(
const TimePos & time,
const float value,
const bool quantPos,
const bool controlKey
)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
if (m_dragging == false)
{
@@ -495,9 +495,9 @@ TimePos AutomationPattern::setDragValue(
/**
* @brief After the point is dragged, this function is called to apply the change.
*/
void AutomationPattern::applyDragValue()
void AutomationClip::applyDragValue()
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
m_dragging = false;
}
@@ -505,9 +505,9 @@ void AutomationPattern::applyDragValue()
float AutomationPattern::valueAt( const TimePos & _time ) const
float AutomationClip::valueAt( const TimePos & _time ) const
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
if( m_timeMap.isEmpty() )
{
@@ -544,9 +544,9 @@ float AutomationPattern::valueAt( const TimePos & _time ) const
// This method will get the value at an offset from a node, so we use the outValue of
// that node and the inValue of the next node for the calculations.
float AutomationPattern::valueAt( timeMap::const_iterator v, int offset ) const
float AutomationClip::valueAt( timeMap::const_iterator v, int offset ) const
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
// We never use it with offset 0, but doesn't hurt to return a correct
// value if we do
@@ -591,9 +591,9 @@ float AutomationPattern::valueAt( timeMap::const_iterator v, int offset ) const
float *AutomationPattern::valuesAfter( const TimePos & _time ) const
float *AutomationClip::valuesAfter( const TimePos & _time ) const
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
timeMap::const_iterator v = m_timeMap.lowerBound(_time);
if( v == m_timeMap.end() || (v+1) == m_timeMap.end() )
@@ -615,9 +615,9 @@ float *AutomationPattern::valuesAfter( const TimePos & _time ) const
void AutomationPattern::flipY(int min, int max)
void AutomationClip::flipY(int min, int max)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
bool changedTimeMap = false;
@@ -645,7 +645,7 @@ void AutomationPattern::flipY(int min, int max)
void AutomationPattern::flipY()
void AutomationClip::flipY()
{
flipY(getMin(), getMax());
}
@@ -653,16 +653,16 @@ void AutomationPattern::flipY()
void AutomationPattern::flipX(int length)
void AutomationClip::flipX(int length)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
timeMap::const_iterator it = m_timeMap.lowerBound(0);
if (it == m_timeMap.end()) { return; }
// Temporary map where we will store the flipped version
// of our pattern
// of our clip
timeMap tempMap;
float tempValue = 0;
@@ -672,7 +672,7 @@ void AutomationPattern::flipX(int length)
float realLength = m_timeMap.lastKey();
// If we have a positive length, we want to flip the area covered by that
// length, even if it goes beyond the pattern. A negative length means that
// length, even if it goes beyond the clip. A negative length means that
// we just want to flip the nodes we have
if (length >= 0 && length != realLength)
{
@@ -752,9 +752,9 @@ void AutomationPattern::flipX(int length)
void AutomationPattern::saveSettings( QDomDocument & _doc, QDomElement & _this )
void AutomationClip::saveSettings( QDomDocument & _doc, QDomElement & _this )
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
_this.setAttribute( "pos", startPosition() );
_this.setAttribute( "len", length() );
@@ -794,9 +794,9 @@ void AutomationPattern::saveSettings( QDomDocument & _doc, QDomElement & _this )
void AutomationPattern::loadSettings( const QDomElement & _this )
void AutomationClip::loadSettings( const QDomElement & _this )
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
clear();
@@ -851,13 +851,13 @@ void AutomationPattern::loadSettings( const QDomElement & _this )
const QString AutomationPattern::name() const
const QString AutomationClip::name() const
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
if( !TrackContentObject::name().isEmpty() )
if( !Clip::name().isEmpty() )
{
return TrackContentObject::name();
return Clip::name();
}
if( !m_objects.isEmpty() && m_objects.first() != nullptr )
{
@@ -869,18 +869,18 @@ const QString AutomationPattern::name() const
TrackContentObjectView * AutomationPattern::createView( TrackView * _tv )
ClipView * AutomationClip::createView( TrackView * _tv )
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
return new AutomationPatternView( this, _tv );
return new AutomationClipView( this, _tv );
}
bool AutomationPattern::isAutomated( const AutomatableModel * _m )
bool AutomationClip::isAutomated( const AutomatableModel * _m )
{
TrackContainer::TrackList l;
l += Engine::getSong()->tracks();
@@ -892,10 +892,10 @@ bool AutomationPattern::isAutomated( const AutomatableModel * _m )
if( ( *it )->type() == Track::AutomationTrack ||
( *it )->type() == Track::HiddenAutomationTrack )
{
const Track::tcoVector & v = ( *it )->getTCOs();
for( Track::tcoVector::ConstIterator j = v.begin(); j != v.end(); ++j )
const Track::clipVector & v = ( *it )->getClips();
for( Track::clipVector::ConstIterator j = v.begin(); j != v.end(); ++j )
{
const AutomationPattern * a = dynamic_cast<const AutomationPattern *>( *j );
const AutomationClip * a = dynamic_cast<const AutomationClip *>( *j );
if( a && a->hasAutomation() )
{
for( objectVector::const_iterator k = a->m_objects.begin(); k != a->m_objects.end(); ++k )
@@ -914,12 +914,12 @@ bool AutomationPattern::isAutomated( const AutomatableModel * _m )
/**
* @brief returns a list of all the automation patterns that are connected to a specific model
* @brief returns a list of all the automation clips that are connected to a specific model
* @param _m the model we want to look for
*/
QVector<AutomationPattern *> AutomationPattern::patternsForModel( const AutomatableModel * _m )
QVector<AutomationClip *> AutomationClip::clipsForModel( const AutomatableModel * _m )
{
QVector<AutomationPattern *> patterns;
QVector<AutomationClip *> clips;
TrackContainer::TrackList l;
l += Engine::getSong()->tracks();
l += Engine::getBBTrackContainer()->tracks();
@@ -932,17 +932,17 @@ QVector<AutomationPattern *> AutomationPattern::patternsForModel( const Automata
if( ( *it )->type() == Track::AutomationTrack ||
( *it )->type() == Track::HiddenAutomationTrack )
{
// get patterns in those tracks....
const Track::tcoVector & v = ( *it )->getTCOs();
// go through all the patterns...
for( Track::tcoVector::ConstIterator j = v.begin(); j != v.end(); ++j )
// get clips in those tracks....
const Track::clipVector & v = ( *it )->getClips();
// go through all the clips...
for( Track::clipVector::ConstIterator j = v.begin(); j != v.end(); ++j )
{
AutomationPattern * a = dynamic_cast<AutomationPattern *>( *j );
// check that the pattern has automation
AutomationClip * a = dynamic_cast<AutomationClip *>( *j );
// check that the clip has automation
if( a && a->hasAutomation() )
{
// now check is the pattern is connected to the model we want by going through all the connections
// of the pattern
// now check is the clip is connected to the model we want by going through all the connections
// of the clip
bool has_object = false;
for( objectVector::const_iterator k = a->m_objects.begin(); k != a->m_objects.end(); ++k )
{
@@ -951,25 +951,25 @@ QVector<AutomationPattern *> AutomationPattern::patternsForModel( const Automata
has_object = true;
}
}
// if the patterns is connected to the model, add it to the list
if( has_object ) { patterns += a; }
// if the clips is connected to the model, add it to the list
if( has_object ) { clips += a; }
}
}
}
}
return patterns;
return clips;
}
AutomationPattern * AutomationPattern::globalAutomationPattern(
AutomationClip * AutomationClip::globalAutomationClip(
AutomatableModel * _m )
{
AutomationTrack * t = Engine::getSong()->globalAutomationTrack();
Track::tcoVector v = t->getTCOs();
for( Track::tcoVector::const_iterator j = v.begin(); j != v.end(); ++j )
Track::clipVector v = t->getClips();
for( Track::clipVector::const_iterator j = v.begin(); j != v.end(); ++j )
{
AutomationPattern * a = dynamic_cast<AutomationPattern *>( *j );
AutomationClip * a = dynamic_cast<AutomationClip *>( *j );
if( a )
{
for( objectVector::const_iterator k = a->m_objects.begin();
@@ -983,7 +983,7 @@ AutomationPattern * AutomationPattern::globalAutomationPattern(
}
}
AutomationPattern * a = new AutomationPattern( t );
AutomationClip * a = new AutomationClip( t );
a->addObject( _m, false );
return a;
}
@@ -991,7 +991,7 @@ AutomationPattern * AutomationPattern::globalAutomationPattern(
void AutomationPattern::resolveAllIDs()
void AutomationClip::resolveAllIDs()
{
TrackContainer::TrackList l = Engine::getSong()->tracks() +
Engine::getBBTrackContainer()->tracks();
@@ -1002,11 +1002,11 @@ void AutomationPattern::resolveAllIDs()
if( ( *it )->type() == Track::AutomationTrack ||
( *it )->type() == Track::HiddenAutomationTrack )
{
Track::tcoVector v = ( *it )->getTCOs();
for( Track::tcoVector::iterator j = v.begin();
Track::clipVector v = ( *it )->getClips();
for( Track::clipVector::iterator j = v.begin();
j != v.end(); ++j )
{
AutomationPattern * a = dynamic_cast<AutomationPattern *>( *j );
AutomationClip * a = dynamic_cast<AutomationClip *>( *j );
if( a )
{
for( QVector<jo_id_t>::Iterator k = a->m_idsToResolve.begin();
@@ -1050,9 +1050,9 @@ void AutomationPattern::resolveAllIDs()
void AutomationPattern::clear()
void AutomationClip::clear()
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
m_timeMap.clear();
@@ -1062,14 +1062,14 @@ void AutomationPattern::clear()
void AutomationPattern::objectDestroyed( jo_id_t _id )
void AutomationClip::objectDestroyed( jo_id_t _id )
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
// TODO: distict between temporary removal (e.g. LADSPA controls
// when switching samplerate) and real deletions because in the latter
// case we had to remove ourselves if we're the global automation
// pattern of the destroyed object
// clip of the destroyed object
m_idsToResolve += _id;
for( objectVector::Iterator objIt = m_objects.begin();
@@ -1090,9 +1090,9 @@ void AutomationPattern::objectDestroyed( jo_id_t _id )
void AutomationPattern::cleanObjects()
void AutomationClip::cleanObjects()
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
for( objectVector::iterator it = m_objects.begin(); it != m_objects.end(); )
{
@@ -1110,7 +1110,7 @@ void AutomationPattern::cleanObjects()
void AutomationPattern::generateTangents()
void AutomationClip::generateTangents()
{
generateTangents(m_timeMap.begin(), m_timeMap.size());
}
@@ -1122,9 +1122,9 @@ void AutomationPattern::generateTangents()
// of the node (in case we have discrete value jumps in the middle of a curve).
// If the inValue and outValue of a node are the same, consequently the inTangent and
// outTangent values of the node will be the same too.
void AutomationPattern::generateTangents(timeMap::iterator it, int numToGenerate)
void AutomationClip::generateTangents(timeMap::iterator it, int numToGenerate)
{
QMutexLocker m(&m_patternMutex);
QMutexLocker m(&m_clipMutex);
if( m_timeMap.size() < 2 && numToGenerate > 0 )
{

28
src/core/AutomationNode.cpp
View File

@@ -1,6 +1,6 @@
/*
* AutomationPattern.cpp - Implementation of class AutomationNode which
* holds information on a single automation pattern node
* AutomationClip.cpp - Implementation of class AutomationNode which
* holds information on a single automation clip node
*
* Copyright (c) 2020 Ian Caio <iancaio_dev/at/hotmail.com>
*
@@ -24,12 +24,12 @@
*/
#include "AutomationNode.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
// Dummy constructor for the QMap
AutomationNode::AutomationNode() :
m_pattern(nullptr),
m_clip(nullptr),
m_pos(0),
m_inValue(0),
m_outValue(0),
@@ -38,8 +38,8 @@ AutomationNode::AutomationNode() :
{
}
AutomationNode::AutomationNode(AutomationPattern* pat, float value, int pos) :
m_pattern(pat),
AutomationNode::AutomationNode(AutomationClip* clip, float value, int pos) :
m_clip(clip),
m_pos(pos),
m_inValue(value),
m_outValue(value),
@@ -48,8 +48,8 @@ AutomationNode::AutomationNode(AutomationPattern* pat, float value, int pos) :
{
}
AutomationNode::AutomationNode(AutomationPattern* pat, float inValue, float outValue, int pos) :
m_pattern(pat),
AutomationNode::AutomationNode(AutomationClip* clip, float inValue, float outValue, int pos) :
m_clip(clip),
m_pos(pos),
m_inValue(inValue),
m_outValue(outValue),
@@ -67,15 +67,15 @@ void AutomationNode::setInValue(float value)
m_inValue = value;
// Recalculate the tangents from neighbor nodes
AutomationPattern::timeMap & tm = m_pattern->getTimeMap();
AutomationClip::timeMap & tm = m_clip->getTimeMap();
// Get an iterator pointing to this node
AutomationPattern::timeMap::iterator it = tm.lowerBound(m_pos);
AutomationClip::timeMap::iterator it = tm.lowerBound(m_pos);
// If it's not the first node, get the one immediately behind it
if (it != tm.begin()) { --it; }
// Generate tangents from the previously, current and next nodes
m_pattern->generateTangents(it, 3);
m_clip->generateTangents(it, 3);
}
/**
@@ -87,15 +87,15 @@ void AutomationNode::setOutValue(float value)
m_outValue = value;
// Recalculate the tangents from neighbor nodes
AutomationPattern::timeMap & tm = m_pattern->getTimeMap();
AutomationClip::timeMap & tm = m_clip->getTimeMap();
// Get an iterator pointing to this node
AutomationPattern::timeMap::iterator it = tm.lowerBound(m_pos);
AutomationClip::timeMap::iterator it = tm.lowerBound(m_pos);
// If it's not the first node, get the one immediately behind it
if (it != tm.begin()) { --it; }
// Generate tangents from the previously, current and next nodes
m_pattern->generateTangents(it, 3);
m_clip->generateTangents(it, 3);
}
/**

18
src/core/BBTCO.cpp → src/core/BBClip.cpp
View File

@@ -1,5 +1,5 @@
/*
* BBTCO.cpp - implementation of class bbTCO
* BBClip.cpp - implementation of class bbClip
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -22,7 +22,7 @@
*
*/
#include "BBTCO.h"
#include "BBClip.h"
#include <QDomElement>
@@ -31,8 +31,8 @@
#include "Engine.h"
BBTCO::BBTCO( Track * _track ) :
TrackContentObject( _track )
BBClip::BBClip( Track * _track ) :
Clip( _track )
{
bar_t t = Engine::getBBTrackContainer()->lengthOfBB( bbTrackIndex() );
if( t > 0 )
@@ -44,7 +44,7 @@ BBTCO::BBTCO( Track * _track ) :
setAutoResize( false );
}
void BBTCO::saveSettings( QDomDocument & doc, QDomElement & element )
void BBClip::saveSettings( QDomDocument & doc, QDomElement & element )
{
element.setAttribute( "name", name() );
if( element.parentNode().nodeName() == "clipboard" )
@@ -66,7 +66,7 @@ void BBTCO::saveSettings( QDomDocument & doc, QDomElement & element )
void BBTCO::loadSettings( const QDomElement & element )
void BBClip::loadSettings( const QDomElement & element )
{
setName( element.attribute( "name" ) );
if( element.attribute( "pos" ).toInt() >= 0 )
@@ -101,14 +101,14 @@ void BBTCO::loadSettings( const QDomElement & element )
int BBTCO::bbTrackIndex()
int BBClip::bbTrackIndex()
{
return dynamic_cast<BBTrack *>( getTrack() )->index();
}
TrackContentObjectView * BBTCO::createView( TrackView * _tv )
ClipView * BBClip::createView( TrackView * _tv )
{
return new BBTCOView( this, _tv );
return new BBClipView( this, _tv );
}

36
src/core/BBTrackContainer.cpp
View File

@@ -53,21 +53,21 @@ BBTrackContainer::~BBTrackContainer()
bool BBTrackContainer::play(TimePos start, fpp_t frames, f_cnt_t offset, int tcoNum)
bool BBTrackContainer::play(TimePos start, fpp_t frames, f_cnt_t offset, int clipNum)
{
bool notePlayed = false;
if (lengthOfBB(tcoNum) <= 0)
if (lengthOfBB(clipNum) <= 0)
{
return false;
}
start = start % (lengthOfBB(tcoNum) * TimePos::ticksPerBar());
start = start % (lengthOfBB(clipNum) * TimePos::ticksPerBar());
TrackList tl = tracks();
for (Track * t : tl)
{
if (t->play(start, frames, offset, tcoNum))
if (t->play(start, frames, offset, clipNum))
{
notePlayed = true;
}
@@ -97,10 +97,10 @@ bar_t BBTrackContainer::lengthOfBB(int bb) const
const TrackList & tl = tracks();
for (Track * t : tl)
{
// Don't create TCOs here if they don't exist
if (bb < t->numOfTCOs())
// Don't create Clips here if they don't exist
if (bb < t->numOfClips())
{
maxLength = qMax(maxLength, t->getTCO(bb)->length());
maxLength = qMax(maxLength, t->getClip(bb)->length());
}
}
@@ -123,7 +123,7 @@ void BBTrackContainer::removeBB(int bb)
TrackList tl = tracks();
for (Track * t : tl)
{
delete t->getTCO(bb);
delete t->getClip(bb);
t->removeBar(bb * DefaultTicksPerBar);
}
if (bb <= currentBB())
@@ -140,7 +140,7 @@ void BBTrackContainer::swapBB(int bb1, int bb2)
TrackList tl = tracks();
for (Track * t : tl)
{
t->swapPositionOfTCOs(bb1, bb2);
t->swapPositionOfClips(bb1, bb2);
}
updateComboBox();
}
@@ -148,9 +148,9 @@ void BBTrackContainer::swapBB(int bb1, int bb2)
void BBTrackContainer::updateBBTrack(TrackContentObject * tco)
void BBTrackContainer::updateBBTrack(Clip * clip)
{
BBTrack * t = BBTrack::findBBTrack(tco->startPosition() / DefaultTicksPerBar);
BBTrack * t = BBTrack::findBBTrack(clip->startPosition() / DefaultTicksPerBar);
if (t != nullptr)
{
t->dataChanged();
@@ -167,7 +167,7 @@ void BBTrackContainer::fixIncorrectPositions()
{
for (int i = 0; i < numOfBBs(); ++i)
{
t->getTCO(i)->movePosition(TimePos(i, 0));
t->getClip(i)->movePosition(TimePos(i, 0));
}
}
}
@@ -231,27 +231,27 @@ void BBTrackContainer::currentBBChanged()
void BBTrackContainer::createTCOsForBB(int bb)
void BBTrackContainer::createClipsForBB(int bb)
{
TrackList tl = tracks();
for (Track * t : tl)
{
t->createTCOsForBB(bb);
t->createClipsForBB(bb);
}
}
AutomatedValueMap BBTrackContainer::automatedValuesAt(TimePos time, int tcoNum) const
AutomatedValueMap BBTrackContainer::automatedValuesAt(TimePos time, int clipNum) const
{
Q_ASSERT(tcoNum >= 0);
Q_ASSERT(clipNum >= 0);
Q_ASSERT(time.getTicks() >= 0);
auto lengthBars = lengthOfBB(tcoNum);
auto lengthBars = lengthOfBB(clipNum);
auto lengthTicks = lengthBars * TimePos::ticksPerBar();
if (time > lengthTicks)
{
time = lengthTicks;
}
return TrackContainer::automatedValuesAt(time + (TimePos::ticksPerBar() * tcoNum), tcoNum);
return TrackContainer::automatedValuesAt(time + (TimePos::ticksPerBar() * clipNum), clipNum);
}

8
src/core/CMakeLists.txt
View File

@@ -5,11 +5,11 @@ set(LMMS_SRCS
core/AudioEngineProfiler.cpp
core/AudioEngineWorkerThread.cpp
core/AutomatableModel.cpp
core/AutomationPattern.cpp
core/AutomationClip.cpp
core/AutomationNode.cpp
core/BandLimitedWave.cpp
core/base64.cpp
core/BBTCO.cpp
core/BBClip.cpp
core/BBTrackContainer.cpp
core/BufferManager.cpp
core/Clipboard.cpp
@@ -66,9 +66,9 @@ set(LMMS_SRCS
core/RenderManager.cpp
core/RingBuffer.cpp
core/SampleBuffer.cpp
core/SampleClip.cpp
core/SamplePlayHandle.cpp
core/SampleRecordHandle.cpp
core/SampleTCO.cpp
core/Scale.cpp
core/SerializingObject.cpp
core/Song.cpp
@@ -77,7 +77,7 @@ set(LMMS_SRCS
core/ToolPlugin.cpp
core/Track.cpp
core/TrackContainer.cpp
core/TrackContentObject.cpp
core/Clip.cpp
core/ValueBuffer.cpp
core/VstSyncController.cpp
core/StepRecorder.cpp

68
src/core/TrackContentObject.cpp → src/core/Clip.cpp
View File

@@ -1,5 +1,5 @@
/*
* TrackContentObject.cpp - implementation of TrackContentObject class
* Clip.cpp - implementation of Clip class
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -22,24 +22,24 @@
*
*/
#include "TrackContentObject.h"
#include "Clip.h"
#include <QDomDocument>
#include "AutomationEditor.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "Engine.h"
#include "GuiApplication.h"
#include "Song.h"
/*! \brief Create a new TrackContentObject
/*! \brief Create a new Clip
*
* Creates a new track content object for the given track.
* Creates a new clip for the given track.
*
* \param _track The track that will contain the new object
*/
TrackContentObject::TrackContentObject( Track * track ) :
Clip::Clip( Track * track ) :
Model( track ),
m_track( track ),
m_startPosition(),
@@ -51,7 +51,7 @@ TrackContentObject::TrackContentObject( Track * track ) :
{
if( getTrack() )
{
getTrack()->addTCO( this );
getTrack()->addClip( this );
}
setJournalling( false );
movePosition( 0 );
@@ -62,32 +62,32 @@ TrackContentObject::TrackContentObject( Track * track ) :
/*! \brief Destroy a TrackContentObject
/*! \brief Destroy a Clip
*
* Destroys the given track content object.
* Destroys the given clip.
*
*/
TrackContentObject::~TrackContentObject()
Clip::~Clip()
{
emit destroyedTCO();
emit destroyedClip();
if( getTrack() )
{
getTrack()->removeTCO( this );
getTrack()->removeClip( this );
}
}
/*! \brief Move this TrackContentObject's position in time
/*! \brief Move this Clip's position in time
*
* If the track content object has moved, update its position. We
* If the clip has moved, update its position. We
* also add a journal entry for undo and update the display.
*
* \param _pos The new position of the track content object.
* \param _pos The new position of the clip.
*/
void TrackContentObject::movePosition( const TimePos & pos )
void Clip::movePosition( const TimePos & pos )
{
TimePos newPos = qMax(0, pos.getTicks());
if (m_startPosition != newPos)
@@ -103,14 +103,14 @@ void TrackContentObject::movePosition( const TimePos & pos )
/*! \brief Change the length of this TrackContentObject
/*! \brief Change the length of this Clip
*
* If the track content object's length has changed, update it. We
* If the clip's length has changed, update it. We
* also add a journal entry for undo and update the display.
*
* \param _length The new length of the track content object.
* \param _length The new length of the clip.
*/
void TrackContentObject::changeLength( const TimePos & length )
void Clip::changeLength( const TimePos & length )
{
m_length = length;
Engine::getSong()->updateLength();
@@ -120,7 +120,7 @@ void TrackContentObject::changeLength( const TimePos & length )
bool TrackContentObject::comparePosition(const TrackContentObject *a, const TrackContentObject *b)
bool Clip::comparePosition(const Clip *a, const Clip *b)
{
return a->startPosition() < b->startPosition();
}
@@ -128,11 +128,11 @@ bool TrackContentObject::comparePosition(const TrackContentObject *a, const Trac
/*! \brief Copies the state of a TrackContentObject to another TrackContentObject
/*! \brief Copies the state of a Clip to another Clip
*
* This method copies the state of a TCO to another TCO
* This method copies the state of a Clip to another Clip
*/
void TrackContentObject::copyStateTo( TrackContentObject *src, TrackContentObject *dst )
void Clip::copyStateTo( Clip *src, Clip *dst )
{
// If the node names match we copy the state
if( src->nodeName() == dst->nodeName() ){
@@ -144,23 +144,23 @@ void TrackContentObject::copyStateTo( TrackContentObject *src, TrackContentObjec
dst->restoreState( parent.firstChild().toElement() );
dst->movePosition( pos );
AutomationPattern::resolveAllIDs();
GuiApplication::instance()->automationEditor()->m_editor->updateAfterPatternChange();
AutomationClip::resolveAllIDs();
GuiApplication::instance()->automationEditor()->m_editor->updateAfterClipChange();
}
}
/*! \brief Mutes this TrackContentObject
/*! \brief Mutes this Clip
*
* Restore the previous state of this track content object. This will
* restore the position or the length of the track content object
* Restore the previous state of this clip. This will
* restore the position or the length of the clip
* depending on what was changed.
*
* \param _je The journal entry to undo
*/
void TrackContentObject::toggleMute()
void Clip::toggleMute()
{
m_mutedModel.setValue( !m_mutedModel.value() );
emit dataChanged();
@@ -169,7 +169,7 @@ void TrackContentObject::toggleMute()
TimePos TrackContentObject::startTimeOffset() const
TimePos Clip::startTimeOffset() const
{
return m_startTimeOffset;
}
@@ -177,14 +177,14 @@ TimePos TrackContentObject::startTimeOffset() const
void TrackContentObject::setStartTimeOffset( const TimePos &startTimeOffset )
void Clip::setStartTimeOffset( const TimePos &startTimeOffset )
{
m_startTimeOffset = startTimeOffset;
}
void TrackContentObject::useCustomClipColor( bool b )
void Clip::useCustomClipColor( bool b )
{
if (b == m_useCustomClipColor) { return; }
m_useCustomClipColor = b;
@@ -192,7 +192,7 @@ void TrackContentObject::useCustomClipColor( bool b )
}
bool TrackContentObject::hasColor()
bool Clip::hasColor()
{
return usesCustomClipColor() || getTrack()->useColor();
}

2
src/core/Clipboard.cpp
View File

@@ -1,5 +1,5 @@
/*
* Clipboard.cpp - the clipboard for patterns, notes etc.
* Clipboard.cpp - the clipboard for clips, notes etc.
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*

10
src/core/DataFile.cpp
View File

@@ -54,7 +54,7 @@ static void findIds(const QDomElement& elem, QList<jo_id_t>& idList);
// QMap with the DOM elements that access file resources
const DataFile::ResourcesMap DataFile::ELEMENTS_WITH_RESOURCES = {
{ "sampletco", {"src"} },
{ "sampleclip", {"src"} },
{ "audiofileprocessor", {"src"} },
};
@@ -95,7 +95,7 @@ DataFile::typeDescStruct
{ DataFile::ClipboardData, "clipboard-data" },
{ DataFile::JournalData, "journaldata" },
{ DataFile::EffectSettings, "effectsettings" },
{ DataFile::NotePattern, "pattern" }
{ DataFile::MidiClip, "pattern" }
} ;
@@ -200,7 +200,7 @@ bool DataFile::validate( QString extension )
return true;
}
break;
case Type::NotePattern:
case Type::MidiClip:
if (extension == "xpt" || extension == "xptz")
{
return true;
@@ -915,7 +915,7 @@ void DataFile::upgrade_0_4_0_20080409()
{
// Upgrade to version 0.4.0-20080409 from some version greater than or equal to 0.4.0-20080129
QStringList s;
s << "note" << "pattern" << "bbtco" << "sampletco" << "time";
s << "note" << "pattern" << "bbclip" << "sampleclip" << "time";
for( QStringList::iterator it = s.begin(); it < s.end(); ++it )
{
QDomNodeList list = elementsByTagName( *it );
@@ -1625,7 +1625,7 @@ void DataFile::upgrade_noHiddenClipNames()
QDomNodeList instClips = track.elementsByTagName("pattern");
QDomNodeList autoClips = track.elementsByTagName("automationpattern");
QDomNodeList bbClips = track.elementsByTagName("bbtco");
QDomNodeList bbClips = track.elementsByTagName("bbclip");
clearDefaultNames(instClips, trackName);
clearDefaultNames(autoClips, trackName);

8
src/core/InlineAutomation.cpp
View File

@@ -33,9 +33,9 @@ void InlineAutomation::saveSettings( QDomDocument & _doc,
if( hasAutomation() )
{
QDomElement ap = _doc.createElement(
AutomationPattern::classNodeName() );
AutomationClip::classNodeName() );
QDomElement v = _doc.createElement( nodeName() );
automationPattern()->saveSettings( _doc, v );
automationClip()->saveSettings( _doc, v );
ap.appendChild( v );
_parent.appendChild( ap );
}
@@ -46,13 +46,13 @@ void InlineAutomation::saveSettings( QDomDocument & _doc,
void InlineAutomation::loadSettings( const QDomElement & _this )
{
QDomNode node = _this.namedItem( AutomationPattern::classNodeName() );
QDomNode node = _this.namedItem( AutomationClip::classNodeName() );
if( node.isElement() )
{
node = node.namedItem( nodeName() );
if( node.isElement() )
{
automationPattern()->loadSettings(
automationClip()->loadSettings(
node.toElement() );
}
}

6
src/core/MeterModel.cpp
View File

@@ -24,7 +24,7 @@
#include "MeterModel.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
MeterModel::MeterModel( ::Model * _parent ) :
@@ -53,8 +53,8 @@ void MeterModel::reset()
m_numeratorModel.setValue( 4 );
m_denominatorModel.setValue( 4 );
AutomationPattern::globalAutomationPattern( &m_numeratorModel )->clear();
AutomationPattern::globalAutomationPattern( &m_denominatorModel )->clear();
AutomationClip::globalAutomationClip( &m_numeratorModel )->clear();
AutomationClip::globalAutomationClip( &m_denominatorModel )->clear();
}

4
src/core/Note.cpp
View File

@@ -211,9 +211,9 @@ void Note::createDetuning()
if( m_detuning == nullptr )
{
m_detuning = new DetuningHelper;
(void) m_detuning->automationPattern();
(void) m_detuning->automationClip();
m_detuning->setRange( -MaxDetuning, MaxDetuning, 0.5f );
m_detuning->automationPattern()->setProgressionType( AutomationPattern::LinearProgression );
m_detuning->automationClip()->setProgressionType( AutomationClip::LinearProgression );
}
}

4
src/core/NotePlayHandle.cpp
View File

@@ -35,7 +35,7 @@
#include "Song.h"
NotePlayHandle::BaseDetuning::BaseDetuning( DetuningHelper *detuning ) :
m_value( detuning ? detuning->automationPattern()->valueAt( 0 ) : 0 )
m_value( detuning ? detuning->automationClip()->valueAt( 0 ) : 0 )
{
}
@@ -559,7 +559,7 @@ void NotePlayHandle::processTimePos( const TimePos& time )
{
if( detuning() && time >= songGlobalParentOffset()+pos() )
{
const float v = detuning()->automationPattern()->valueAt( time - songGlobalParentOffset() - pos() );
const float v = detuning()->automationClip()->valueAt( time - songGlobalParentOffset() - pos() );
if( !typeInfo<float>::isEqual( v, m_baseDetuning->value() ) )
{
m_baseDetuning->setValue( v );

74
src/core/SampleTCO.cpp → src/core/SampleClip.cpp
View File

@@ -1,5 +1,5 @@
/*
* SampleTCO.cpp
* SampleClip.cpp
*
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -22,15 +22,15 @@
*
*/
#include "SampleTCO.h"
#include "SampleClip.h"
#include <QDomElement>
#include "SampleTCOView.h"
#include "SampleClipView.h"
#include "TimeLineWidget.h"
SampleTCO::SampleTCO( Track * _track ) :
TrackContentObject( _track ),
SampleClip::SampleClip( Track * _track ) :
Clip( _track ),
m_sampleBuffer( new SampleBuffer ),
m_isPlaying( false )
{
@@ -39,7 +39,7 @@ SampleTCO::SampleTCO( Track * _track ) :
restoreJournallingState();
// we need to receive bpm-change-events, because then we have to
// change length of this TCO
// change length of this Clip
connect( Engine::getSong(), SIGNAL( tempoChanged( bpm_t ) ),
this, SLOT( updateLength() ), Qt::DirectConnection );
connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int,int ) ),
@@ -57,13 +57,13 @@ SampleTCO::SampleTCO( Track * _track ) :
//care about loops
connect( Engine::getSong(), SIGNAL( updateSampleTracks() ),
this, SLOT( playbackPositionChanged() ), Qt::DirectConnection );
//care about mute TCOs
//care about mute Clips
connect( this, SIGNAL( dataChanged() ), this, SLOT( playbackPositionChanged() ) );
//care about mute track
connect( getTrack()->getMutedModel(), SIGNAL( dataChanged() ),
this, SLOT( playbackPositionChanged() ), Qt::DirectConnection );
//care about TCO position
connect( this, SIGNAL( positionChanged() ), this, SLOT( updateTrackTcos() ) );
//care about Clip position
connect( this, SIGNAL( positionChanged() ), this, SLOT( updateTrackClips() ) );
switch( getTrack()->trackContainer()->type() )
{
@@ -77,13 +77,13 @@ SampleTCO::SampleTCO( Track * _track ) :
setAutoResize( false );
break;
}
updateTrackTcos();
updateTrackClips();
}
SampleTCO::SampleTCO(const SampleTCO& orig) :
SampleTCO(orig.getTrack())
SampleClip::SampleClip(const SampleClip& orig) :
SampleClip(orig.getTrack())
{
// TODO: This creates a new SampleBuffer for the new TCO, eating up memory
// TODO: This creates a new SampleBuffer for the new Clip, eating up memory
// & eventually causing performance issues. Letting tracks share buffers
// when they're identical would fix this, but isn't possible right now.
*m_sampleBuffer = *orig.m_sampleBuffer;
@@ -93,12 +93,12 @@ SampleTCO::SampleTCO(const SampleTCO& orig) :
SampleTCO::~SampleTCO()
SampleClip::~SampleClip()
{
SampleTrack * sampletrack = dynamic_cast<SampleTrack*>( getTrack() );
if ( sampletrack )
{
sampletrack->updateTcos();
sampletrack->updateClips();
}
Engine::audioEngine()->requestChangeInModel();
sharedObject::unref( m_sampleBuffer );
@@ -108,22 +108,22 @@ SampleTCO::~SampleTCO()
void SampleTCO::changeLength( const TimePos & _length )
void SampleClip::changeLength( const TimePos & _length )
{
TrackContentObject::changeLength( qMax( static_cast<int>( _length ), 1 ) );
Clip::changeLength( qMax( static_cast<int>( _length ), 1 ) );
}
const QString & SampleTCO::sampleFile() const
const QString & SampleClip::sampleFile() const
{
return m_sampleBuffer->audioFile();
}
void SampleTCO::setSampleBuffer( SampleBuffer* sb )
void SampleClip::setSampleBuffer( SampleBuffer* sb )
{
Engine::audioEngine()->requestChangeInModel();
sharedObject::unref( m_sampleBuffer );
@@ -136,11 +136,11 @@ void SampleTCO::setSampleBuffer( SampleBuffer* sb )
void SampleTCO::setSampleFile( const QString & _sf )
void SampleClip::setSampleFile( const QString & _sf )
{
int length;
if ( _sf.isEmpty() )
{ //When creating an empty sample pattern make it a bar long
{ //When creating an empty sample clip make it a bar long
float nom = Engine::getSong()->getTimeSigModel().getNumerator();
float den = Engine::getSong()->getTimeSigModel().getDenominator();
length = DefaultTicksPerBar * ( nom / den );
@@ -161,7 +161,7 @@ void SampleTCO::setSampleFile( const QString & _sf )
void SampleTCO::toggleRecord()
void SampleClip::toggleRecord()
{
m_recordModel.setValue( !m_recordModel.value() );
emit dataChanged();
@@ -170,29 +170,29 @@ void SampleTCO::toggleRecord()
void SampleTCO::playbackPositionChanged()
void SampleClip::playbackPositionChanged()
{
Engine::audioEngine()->removePlayHandlesOfTypes( getTrack(), PlayHandle::TypeSamplePlayHandle );
SampleTrack * st = dynamic_cast<SampleTrack*>( getTrack() );
st->setPlayingTcos( false );
st->setPlayingClips( false );
}
void SampleTCO::updateTrackTcos()
void SampleClip::updateTrackClips()
{
SampleTrack * sampletrack = dynamic_cast<SampleTrack*>( getTrack() );
if( sampletrack)
{
sampletrack->updateTcos();
sampletrack->updateClips();
}
}
bool SampleTCO::isPlaying() const
bool SampleClip::isPlaying() const
{
return m_isPlaying;
}
@@ -200,7 +200,7 @@ bool SampleTCO::isPlaying() const
void SampleTCO::setIsPlaying(bool isPlaying)
void SampleClip::setIsPlaying(bool isPlaying)
{
m_isPlaying = isPlaying;
}
@@ -208,7 +208,7 @@ void SampleTCO::setIsPlaying(bool isPlaying)
void SampleTCO::updateLength()
void SampleClip::updateLength()
{
emit sampleChanged();
}
@@ -216,7 +216,7 @@ void SampleTCO::updateLength()
TimePos SampleTCO::sampleLength() const
TimePos SampleClip::sampleLength() const
{
return (int)( m_sampleBuffer->frames() / Engine::framesPerTick() );
}
@@ -224,7 +224,7 @@ TimePos SampleTCO::sampleLength() const
void SampleTCO::setSampleStartFrame(f_cnt_t startFrame)
void SampleClip::setSampleStartFrame(f_cnt_t startFrame)
{
m_sampleBuffer->setStartFrame( startFrame );
}
@@ -232,7 +232,7 @@ void SampleTCO::setSampleStartFrame(f_cnt_t startFrame)
void SampleTCO::setSamplePlayLength(f_cnt_t length)
void SampleClip::setSamplePlayLength(f_cnt_t length)
{
m_sampleBuffer->setEndFrame( length );
}
@@ -240,7 +240,7 @@ void SampleTCO::setSamplePlayLength(f_cnt_t length)
void SampleTCO::saveSettings( QDomDocument & _doc, QDomElement & _this )
void SampleClip::saveSettings( QDomDocument & _doc, QDomElement & _this )
{
if( _this.parentNode().nodeName() == "clipboard" )
{
@@ -275,7 +275,7 @@ void SampleTCO::saveSettings( QDomDocument & _doc, QDomElement & _this )
void SampleTCO::loadSettings( const QDomElement & _this )
void SampleClip::loadSettings( const QDomElement & _this )
{
if( _this.attribute( "pos" ).toInt() >= 0 )
{
@@ -307,14 +307,14 @@ void SampleTCO::loadSettings( const QDomElement & _this )
if(_this.hasAttribute("reversed"))
{
m_sampleBuffer->setReversed(true);
emit wasReversed(); // tell SampleTCOView to update the view
emit wasReversed(); // tell SampleClipView to update the view
}
}
TrackContentObjectView * SampleTCO::createView( TrackView * _tv )
ClipView * SampleClip::createView( TrackView * _tv )
{
return new SampleTCOView( this, _tv );
return new SampleClipView( this, _tv );
}

10
src/core/SamplePlayHandle.cpp
View File

@@ -29,7 +29,7 @@
#include "Engine.h"
#include "InstrumentTrack.h"
#include "lmms_constants.h"
#include "SampleTCO.h"
#include "SampleClip.h"
@@ -62,11 +62,11 @@ SamplePlayHandle::SamplePlayHandle( const QString& sampleFile ) :
SamplePlayHandle::SamplePlayHandle( SampleTCO* tco ) :
SamplePlayHandle( tco->sampleBuffer() , false)
SamplePlayHandle::SamplePlayHandle( SampleClip* clip ) :
SamplePlayHandle( clip->sampleBuffer() , false)
{
m_track = tco->getTrack();
setAudioPort( ( (SampleTrack *)tco->getTrack() )->audioPort() );
m_track = clip->getTrack();
setAudioPort( ( (SampleTrack *)clip->getTrack() )->audioPort() );
}

14
src/core/SampleRecordHandle.cpp
View File

@@ -33,13 +33,13 @@
#include "debug.h"
SampleRecordHandle::SampleRecordHandle( SampleTCO* tco ) :
SampleRecordHandle::SampleRecordHandle( SampleClip* clip ) :
PlayHandle( TypeSamplePlayHandle ),
m_framesRecorded( 0 ),
m_minLength( tco->length() ),
m_track( tco->getTrack() ),
m_minLength( clip->length() ),
m_track( clip->getTrack() ),
m_bbTrack( nullptr ),
m_tco( tco )
m_clip( clip )
{
}
@@ -52,7 +52,7 @@ SampleRecordHandle::~SampleRecordHandle()
{
SampleBuffer* sb;
createSampleBuffer( &sb );
m_tco->setSampleBuffer( sb );
m_clip->setSampleBuffer( sb );
}
while( !m_buffers.empty() )
@@ -60,7 +60,7 @@ SampleRecordHandle::~SampleRecordHandle()
delete[] m_buffers.front().first;
m_buffers.erase( m_buffers.begin() );
}
m_tco->setRecord( false );
m_clip->setRecord( false );
}
@@ -76,7 +76,7 @@ void SampleRecordHandle::play( sampleFrame * /*_working_buffer*/ )
TimePos len = (tick_t)( m_framesRecorded / Engine::framesPerTick() );
if( len > m_minLength )
{
// m_tco->changeLength( len );
// m_clip->changeLength( len );
m_minLength = len;
}
}

66
src/core/Song.cpp
View File

@@ -50,7 +50,7 @@
#include "ExportFilter.h"
#include "InstrumentTrack.h"
#include "NotePlayHandle.h"
#include "Pattern.h"
#include "MidiClip.h"
#include "PianoRoll.h"
#include "ProjectJournal.h"
#include "ProjectNotes.h"
@@ -89,8 +89,8 @@ Song::Song() :
m_isCancelled( false ),
m_playMode( Mode_None ),
m_length( 0 ),
m_patternToPlay( nullptr ),
m_loopPattern( false ),
m_midiClipToPlay( nullptr ),
m_loopMidiClip( false ),
m_elapsedTicks( 0 ),
m_elapsedBars( 0 ),
m_loopRenderCount(1),
@@ -227,11 +227,11 @@ void Song::processNextBuffer()
}
break;
case Mode_PlayPattern:
if (m_patternToPlay)
case Mode_PlayMidiClip:
if (m_midiClipToPlay)
{
clipNum = m_patternToPlay->getTrack()->getTCONum(m_patternToPlay);
trackList.push_back(m_patternToPlay->getTrack());
clipNum = m_midiClipToPlay->getTrack()->getClipNum(m_midiClipToPlay);
trackList.push_back(m_midiClipToPlay->getTrack());
}
break;
@@ -288,15 +288,15 @@ void Song::processNextBuffer()
frameOffsetInTick -= elapsedTicks * framesPerTick;
getPlayPos().setCurrentFrame(frameOffsetInTick);
// If we are playing a BB track, or a pattern with no loop enabled,
// If we are playing a BB track, or a MIDI clip with no loop enabled,
// loop back to the beginning when we reach the end
if (m_playMode == Mode_PlayBB)
{
enforceLoop(TimePos{0}, TimePos{Engine::getBBTrackContainer()->lengthOfCurrentBB(), 0});
}
else if (m_playMode == Mode_PlayPattern && m_loopPattern && !loopEnabled)
else if (m_playMode == Mode_PlayMidiClip && m_loopMidiClip && !loopEnabled)
{
enforceLoop(TimePos{0}, m_patternToPlay->length());
enforceLoop(TimePos{0}, m_midiClipToPlay->length());
}
// Handle loop points, and inform VST plugins of the loop status
@@ -362,7 +362,7 @@ void Song::processAutomations(const TrackList &tracklist, TimePos timeStart, fpp
QSet<const AutomatableModel*> recordedModels;
TrackContainer* container = this;
int tcoNum = -1;
int clipNum = -1;
switch (m_playMode)
{
@@ -375,28 +375,28 @@ void Song::processAutomations(const TrackList &tracklist, TimePos timeStart, fpp
auto bbTrack = dynamic_cast<BBTrack*>(tracklist.at(0));
auto bbContainer = Engine::getBBTrackContainer();
container = bbContainer;
tcoNum = bbTrack->index();
clipNum = bbTrack->index();
}
break;
default:
return;
}
values = container->automatedValuesAt(timeStart, tcoNum);
values = container->automatedValuesAt(timeStart, clipNum);
TrackList tracks = container->tracks();
Track::tcoVector tcos;
Track::clipVector clips;
for (Track* track : tracks)
{
if (track->type() == Track::AutomationTrack) {
track->getTCOsInRange(tcos, 0, timeStart);
track->getClipsInRange(clips, 0, timeStart);
}
}
// Process recording
for (TrackContentObject* tco : tcos)
for (Clip* clip : clips)
{
auto p = dynamic_cast<AutomationPattern *>(tco);
auto p = dynamic_cast<AutomationClip *>(clip);
TimePos relTime = timeStart - p->startPosition();
if (p->isRecording() && relTime >= 0 && relTime < p->length())
{
@@ -407,7 +407,7 @@ void Song::processAutomations(const TrackList &tracklist, TimePos timeStart, fpp
}
}
// Checks if an automated model stopped being automated by automation patterns
// Checks if an automated model stopped being automated by automation clip
// so we can move the control back to any connected controller again
for (auto it = m_oldAutomatedValues.begin(); it != m_oldAutomatedValues.end(); it++)
{
@@ -539,19 +539,19 @@ void Song::playBB()
void Song::playPattern( const Pattern* patternToPlay, bool loop )
void Song::playMidiClip( const MidiClip* midiClipToPlay, bool loop )
{
if( isStopped() == false )
{
stop();
}
m_patternToPlay = patternToPlay;
m_loopPattern = loop;
m_midiClipToPlay = midiClipToPlay;
m_loopMidiClip = loop;
if( m_patternToPlay != nullptr )
if( m_midiClipToPlay != nullptr )
{
m_playMode = Mode_PlayPattern;
m_playMode = Mode_PlayMidiClip;
m_playing = true;
m_paused = false;
}
@@ -835,15 +835,15 @@ bpm_t Song::getTempo()
AutomationPattern * Song::tempoAutomationPattern()
AutomationClip * Song::tempoAutomationClip()
{
return AutomationPattern::globalAutomationPattern( &m_tempoModel );
return AutomationClip::globalAutomationClip( &m_tempoModel );
}
AutomatedValueMap Song::automatedValuesAt(TimePos time, int tcoNum) const
AutomatedValueMap Song::automatedValuesAt(TimePos time, int clipNum) const
{
return TrackContainer::automatedValuesFromTracks(TrackList{m_globalAutomationTrack} << tracks(), time, tcoNum);
return TrackContainer::automatedValuesFromTracks(TrackList{m_globalAutomationTrack} << tracks(), time, clipNum);
}
@@ -886,7 +886,7 @@ void Song::clearProject()
if( getGUI() != nullptr && getGUI()->automationEditor() )
{
getGUI()->automationEditor()->setCurrentPattern( nullptr );
getGUI()->automationEditor()->setCurrentClip( nullptr );
}
if( getGUI() != nullptr && getGUI()->pianoRoll() )
@@ -902,10 +902,10 @@ void Song::clearProject()
// Clear the m_oldAutomatedValues AutomatedValueMap
m_oldAutomatedValues.clear();
AutomationPattern::globalAutomationPattern( &m_tempoModel )->clear();
AutomationPattern::globalAutomationPattern( &m_masterVolumeModel )->
AutomationClip::globalAutomationClip( &m_tempoModel )->clear();
AutomationClip::globalAutomationClip( &m_masterVolumeModel )->
clear();
AutomationPattern::globalAutomationPattern( &m_masterPitchModel )->
AutomationClip::globalAutomationClip( &m_masterPitchModel )->
clear();
Engine::audioEngine()->doneChangeInModel();
@@ -1169,7 +1169,7 @@ void Song::loadProject( const QString & fileName )
node = node.nextSibling();
}
// quirk for fixing projects with broken positions of TCOs inside
// quirk for fixing projects with broken positions of Clips inside
// BB-tracks
Engine::getBBTrackContainer()->fixIncorrectPositions();
@@ -1183,7 +1183,7 @@ void Song::loadProject( const QString & fileName )
m_controllers.end());
// resolve all IDs so that autoModels are automated
AutomationPattern::resolveAllIDs();
AutomationClip::resolveAllIDs();
Engine::audioEngine()->doneChangeInModel();

20
src/core/StepRecorder.cpp
View File

@@ -33,7 +33,7 @@ const int REMOVE_RELEASED_NOTE_TIME_THRESHOLD_MS = 70;
StepRecorder::StepRecorder(PianoRoll& pianoRoll, StepRecorderWidget& stepRecorderWidget):
m_pianoRoll(pianoRoll),
m_stepRecorderWidget(stepRecorderWidget),
m_pattern(nullptr)
m_midiClip(nullptr)
{
m_stepRecorderWidget.hide();
}
@@ -109,7 +109,7 @@ void StepRecorder::noteReleased(const Note & n)
m_updateReleasedTimer.start(REMOVE_RELEASED_NOTE_TIME_THRESHOLD_MS);
}
//check if all note are released, apply notes to pattern(or dimiss if length is zero) and prepare to record next step
//check if all note are released, apply notes to clips (or dimiss if length is zero) and prepare to record next step
if(allCurStepNotesReleased())
{
if(m_curStepLength > 0)
@@ -226,16 +226,16 @@ void StepRecorder::stepBackwards()
void StepRecorder::applyStep()
{
m_pattern->addJournalCheckPoint();
m_midiClip->addJournalCheckPoint();
for (const StepNote* stepNote : m_curStepNotes)
{
m_pattern->addNote(stepNote->m_note, false);
m_midiClip->addNote(stepNote->m_note, false);
}
m_pattern->rearrangeAllNotes();
m_pattern->updateLength();
m_pattern->dataChanged();
m_midiClip->rearrangeAllNotes();
m_midiClip->updateLength();
m_midiClip->dataChanged();
Engine::getSong()->setModified();
prepareNewStep();
@@ -267,14 +267,14 @@ void StepRecorder::prepareNewStep()
updateWidget();
}
void StepRecorder::setCurrentPattern( Pattern* newPattern )
void StepRecorder::setCurrentMidiClip( MidiClip* newMidiClip )
{
if(m_pattern != nullptr && m_pattern != newPattern)
if(m_midiClip != nullptr && m_midiClip != newMidiClip)
{
dismissStep();
}
m_pattern = newPattern;
m_midiClip = newMidiClip;
}
void StepRecorder::removeNotesReleasedForTooLong()

204
src/core/Track.cpp
View File

@@ -31,7 +31,7 @@
#include <QVariant>
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "AutomationTrack.h"
#include "BBTrack.h"
#include "BBTrackContainer.h"
@@ -60,7 +60,7 @@ Track::Track( TrackTypes type, TrackContainer * tc ) :
m_mutedModel( false, this, tr( "Mute" ) ), /*!< For controlling track muting */
m_soloModel( false, this, tr( "Solo" ) ), /*!< For controlling track soloing */
m_simpleSerializingMode( false ),
m_trackContentObjects(), /*!< The track content objects (segments) */
m_clips(), /*!< The clips (segments) */
m_color( 0, 0, 0 ),
m_hasColor( false )
{
@@ -76,7 +76,7 @@ Track::Track( TrackTypes type, TrackContainer * tc ) :
* If the track container is a Beat+Bassline container, step through
* its list of tracks and remove us.
*
* Then delete the TrackContentObject's contents, remove this track from
* Then delete the Clip's contents, remove this track from
* the track container.
*
* Finally step through this track's automation and forget all of them.
@@ -86,9 +86,9 @@ Track::~Track()
lock();
emit destroyedTrack();
while( !m_trackContentObjects.isEmpty() )
while( !m_clips.isEmpty() )
{
delete m_trackContentObjects.last();
delete m_clips.last();
}
m_trackContainer->removeTrack( this );
@@ -124,7 +124,7 @@ Track * Track::create( TrackTypes tt, TrackContainer * tc )
if( tc == Engine::getBBTrackContainer() && t )
{
t->createTCOsForBB( Engine::getBBTrackContainer()->numOfBBs()
t->createClipsForBB( Engine::getBBTrackContainer()->numOfBBs()
- 1 );
}
@@ -173,7 +173,7 @@ Track* Track::clone()
saveState(doc, parent);
Track* t = create(parent.firstChild().toElement(), m_trackContainer);
AutomationPattern::resolveAllIDs();
AutomationClip::resolveAllIDs();
return t;
}
@@ -185,7 +185,7 @@ Track* Track::clone()
/*! \brief Save this track's settings to file
*
* We save the track type and its muted state and solo state, then append the track-
* specific settings. Then we iterate through the trackContentObjects
* specific settings. Then we iterate through the clips
* and save all their states in turn.
*
* \param doc The QDomDocument to use to save
@@ -228,9 +228,9 @@ void Track::saveSettings( QDomDocument & doc, QDomElement & element )
return;
}
// now save settings of all TCO's
for( tcoVector::const_iterator it = m_trackContentObjects.begin();
it != m_trackContentObjects.end(); ++it )
// now save settings of all Clip's
for( clipVector::const_iterator it = m_clips.begin();
it != m_clips.end(); ++it )
{
( *it )->saveState( doc, element );
}
@@ -242,10 +242,10 @@ void Track::saveSettings( QDomDocument & doc, QDomElement & element )
/*! \brief Load the settings from a file
*
* We load the track's type and muted state and solo state, then clear out our
* current TrackContentObject.
* current Clip.
*
* Then we step through the QDomElement's children and load the
* track-specific settings and trackContentObjects states from it
* track-specific settings and clip states from it
* one at a time.
*
* \param element the QDomElement to load track settings from
@@ -294,10 +294,10 @@ void Track::loadSettings( const QDomElement & element )
return;
}
while( !m_trackContentObjects.empty() )
while( !m_clips.empty() )
{
delete m_trackContentObjects.front();
// m_trackContentObjects.erase( m_trackContentObjects.begin() );
delete m_clips.front();
// m_clips.erase( m_clips.begin() );
}
QDomNode node = element.firstChild();
@@ -313,9 +313,9 @@ void Track::loadSettings( const QDomElement & element )
&& node.nodeName() != "solo"
&& !node.toElement().attribute( "metadata" ).toInt() )
{
TrackContentObject * tco = createTCO(
Clip * clip = createClip(
TimePos( 0 ) );
tco->restoreState( node.toElement() );
clip->restoreState( node.toElement() );
}
}
node = node.nextSibling();
@@ -331,34 +331,32 @@ void Track::loadSettings( const QDomElement & element )
/*! \brief Add another TrackContentObject into this track
/*! \brief Add another Clip into this track
*
* \param tco The TrackContentObject to attach to this track.
* \param clip The Clip to attach to this track.
*/
TrackContentObject * Track::addTCO( TrackContentObject * tco )
Clip * Track::addClip( Clip * clip )
{
m_trackContentObjects.push_back( tco );
m_clips.push_back( clip );
emit trackContentObjectAdded( tco );
emit clipAdded( clip );
return tco; // just for convenience
return clip; // just for convenience
}
/*! \brief Remove a given TrackContentObject from this track
/*! \brief Remove a given Clip from this track
*
* \param tco The TrackContentObject to remove from this track.
* \param clip The Clip to remove from this track.
*/
void Track::removeTCO( TrackContentObject * tco )
void Track::removeClip( Clip * clip )
{
tcoVector::iterator it = std::find( m_trackContentObjects.begin(),
m_trackContentObjects.end(),
tco );
if( it != m_trackContentObjects.end() )
clipVector::iterator it = std::find( m_clips.begin(), m_clips.end(), clip );
if( it != m_clips.end() )
{
m_trackContentObjects.erase( it );
m_clips.erase( it );
if( Engine::getSong() )
{
Engine::getSong()->updateLength();
@@ -368,105 +366,103 @@ void Track::removeTCO( TrackContentObject * tco )
}
/*! \brief Remove all TCOs from this track */
void Track::deleteTCOs()
/*! \brief Remove all Clips from this track */
void Track::deleteClips()
{
while( ! m_trackContentObjects.isEmpty() )
while( ! m_clips.isEmpty() )
{
delete m_trackContentObjects.first();
delete m_clips.first();
}
}
/*! \brief Return the number of trackContentObjects we contain
/*! \brief Return the number of clips we contain
*
* \return the number of trackContentObjects we currently contain.
* \return the number of clips we currently contain.
*/
int Track::numOfTCOs()
int Track::numOfClips()
{
return m_trackContentObjects.size();
return m_clips.size();
}
/*! \brief Get a TrackContentObject by number
/*! \brief Get a Clip by number
*
* If the TCO number is less than our TCO array size then fetch that
* If the Clip number is less than our Clip array size then fetch that
* numbered object from the array. Otherwise we warn the user that
* we've somehow requested a TCO that is too large, and create a new
* TCO for them.
* \param tcoNum The number of the TrackContentObject to fetch.
* \return the given TrackContentObject or a new one if out of range.
* \todo reject TCO numbers less than zero.
* \todo if we create a TCO here, should we somehow attach it to the
* we've somehow requested a Clip that is too large, and create a new
* Clip for them.
* \param clipNum The number of the Clip to fetch.
* \return the given Clip or a new one if out of range.
* \todo reject Clip numbers less than zero.
* \todo if we create a Clip here, should we somehow attach it to the
* track?
*/
TrackContentObject * Track::getTCO( int tcoNum )
Clip * Track::getClip( int clipNum )
{
if( tcoNum < m_trackContentObjects.size() )
if( clipNum < m_clips.size() )
{
return m_trackContentObjects[tcoNum];
return m_clips[clipNum];
}
printf( "called Track::getTCO( %d ), "
"but TCO %d doesn't exist\n", tcoNum, tcoNum );
return createTCO( tcoNum * TimePos::ticksPerBar() );
printf( "called Track::getClip( %d ), "
"but Clip %d doesn't exist\n", clipNum, clipNum );
return createClip( clipNum * TimePos::ticksPerBar() );
}
/*! \brief Determine the given TrackContentObject's number in our array.
/*! \brief Determine the given Clip's number in our array.
*
* \param tco The TrackContentObject to search for.
* \param clip The Clip to search for.
* \return its number in our array.
*/
int Track::getTCONum( const TrackContentObject * tco )
int Track::getClipNum( const Clip * clip )
{
// for( int i = 0; i < getTrackContentWidget()->numOfTCOs(); ++i )
tcoVector::iterator it = std::find( m_trackContentObjects.begin(),
m_trackContentObjects.end(),
tco );
if( it != m_trackContentObjects.end() )
// for( int i = 0; i < getTrackContentWidget()->numOfClips(); ++i )
clipVector::iterator it = std::find( m_clips.begin(), m_clips.end(), clip );
if( it != m_clips.end() )
{
/* if( getTCO( i ) == _tco )
/* if( getClip( i ) == _clip )
{
return i;
}*/
return it - m_trackContentObjects.begin();
return it - m_clips.begin();
}
qWarning( "Track::getTCONum(...) -> _tco not found!\n" );
qWarning( "Track::getClipNum(...) -> _clip not found!\n" );
return 0;
}
/*! \brief Retrieve a list of trackContentObjects that fall within a period.
/*! \brief Retrieve a list of clips that fall within a period.
*
* Here we're interested in a range of trackContentObjects that intersect
* Here we're interested in a range of clips that intersect
* the given time period.
*
* We return the TCOs we find in order by time, earliest TCOs first.
* We return the Clips we find in order by time, earliest Clips first.
*
* \param tcoV The list to contain the found trackContentObjects.
* \param clipV The list to contain the found clips.
* \param start The MIDI start time of the range.
* \param end The MIDI endi time of the range.
*/
void Track::getTCOsInRange( tcoVector & tcoV, const TimePos & start,
void Track::getClipsInRange( clipVector & clipV, const TimePos & start,
const TimePos & end )
{
for( TrackContentObject* tco : m_trackContentObjects )
for( Clip* clip : m_clips )
{
int s = tco->startPosition();
int e = tco->endPosition();
int s = clip->startPosition();
int e = clip->endPosition();
if( ( s <= end ) && ( e >= start ) )
{
// TCO is within given range
// Insert sorted by TCO's position
tcoV.insert(std::upper_bound(tcoV.begin(), tcoV.end(), tco, TrackContentObject::comparePosition),
tco);
// Clip is within given range
// Insert sorted by Clip's position
clipV.insert(std::upper_bound(clipV.begin(), clipV.end(), clip, Clip::comparePosition),
clip);
}
}
}
@@ -474,55 +470,53 @@ void Track::getTCOsInRange( tcoVector & tcoV, const TimePos & start,
/*! \brief Swap the position of two trackContentObjects.
/*! \brief Swap the position of two clips.
*
* First, we arrange to swap the positions of the two TCOs in the
* trackContentObjects list. Then we swap their start times as well.
* First, we arrange to swap the positions of the two Clips in the
* clips list. Then we swap their start times as well.
*
* \param tcoNum1 The first TrackContentObject to swap.
* \param tcoNum2 The second TrackContentObject to swap.
* \param clipNum1 The first Clip to swap.
* \param clipNum2 The second Clip to swap.
*/
void Track::swapPositionOfTCOs( int tcoNum1, int tcoNum2 )
void Track::swapPositionOfClips( int clipNum1, int clipNum2 )
{
qSwap( m_trackContentObjects[tcoNum1],
m_trackContentObjects[tcoNum2] );
qSwap( m_clips[clipNum1], m_clips[clipNum2] );
const TimePos pos = m_trackContentObjects[tcoNum1]->startPosition();
const TimePos pos = m_clips[clipNum1]->startPosition();
m_trackContentObjects[tcoNum1]->movePosition(
m_trackContentObjects[tcoNum2]->startPosition() );
m_trackContentObjects[tcoNum2]->movePosition( pos );
m_clips[clipNum1]->movePosition( m_clips[clipNum2]->startPosition() );
m_clips[clipNum2]->movePosition( pos );
}
void Track::createTCOsForBB( int bb )
void Track::createClipsForBB( int bb )
{
while( numOfTCOs() < bb + 1 )
while( numOfClips() < bb + 1 )
{
TimePos position = TimePos( numOfTCOs(), 0 );
TrackContentObject * tco = createTCO( position );
tco->changeLength( TimePos( 1, 0 ) );
TimePos position = TimePos( numOfClips(), 0 );
Clip * clip = createClip( position );
clip->changeLength( TimePos( 1, 0 ) );
}
}
/*! \brief Move all the trackContentObjects after a certain time later by one bar.
/*! \brief Move all the clips after a certain time later by one bar.
*
* \param pos The time at which we want to insert the bar.
* \todo if we stepped through this list last to first, and the list was
* in ascending order by TCO time, once we hit a TCO that was earlier
* in ascending order by Clip time, once we hit a Clip that was earlier
* than the insert time, we could fall out of the loop early.
*/
void Track::insertBar( const TimePos & pos )
{
// we'll increase the position of every TCO, positioned behind pos, by
// we'll increase the position of every Clip, positioned behind pos, by
// one bar
for( tcoVector::iterator it = m_trackContentObjects.begin();
it != m_trackContentObjects.end(); ++it )
for( clipVector::iterator it = m_clips.begin();
it != m_clips.end(); ++it )
{
if( ( *it )->startPosition() >= pos )
{
@@ -535,16 +529,15 @@ void Track::insertBar( const TimePos & pos )
/*! \brief Move all the trackContentObjects after a certain time earlier by one bar.
/*! \brief Move all the clips after a certain time earlier by one bar.
*
* \param pos The time at which we want to remove the bar.
*/
void Track::removeBar( const TimePos & pos )
{
// we'll decrease the position of every TCO, positioned behind pos, by
// we'll decrease the position of every Clip, positioned behind pos, by
// one bar
for( tcoVector::iterator it = m_trackContentObjects.begin();
it != m_trackContentObjects.end(); ++it )
for( clipVector::iterator it = m_clips.begin(); it != m_clips.end(); ++it )
{
if( ( *it )->startPosition() >= pos )
{
@@ -558,7 +551,7 @@ void Track::removeBar( const TimePos & pos )
/*! \brief Return the length of the entire track in bars
*
* We step through our list of TCOs and determine their end position,
* We step through our list of Clips and determine their end position,
* keeping track of the latest time found in ticks. Then we return
* that in bars by dividing by the number of ticks per bar.
*/
@@ -566,8 +559,7 @@ bar_t Track::length() const
{
// find last end-position
tick_t last = 0;
for( tcoVector::const_iterator it = m_trackContentObjects.begin();
it != m_trackContentObjects.end(); ++it )
for( clipVector::const_iterator it = m_clips.begin(); it != m_clips.end(); ++it )
{
if( Engine::getSong()->isExporting() &&
( *it )->isMuted() )

34
src/core/TrackContainer.cpp
View File

@@ -29,7 +29,7 @@
#include <QDomElement>
#include <QWriteLocker>
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "AutomationTrack.h"
#include "BBTrack.h"
#include "BBTrackContainer.h"
@@ -238,7 +238,7 @@ bool TrackContainer::isEmpty() const
for( TrackList::const_iterator it = m_tracks.begin();
it != m_tracks.end(); ++it )
{
if( !( *it )->getTCOs().isEmpty() )
if( !( *it )->getClips().isEmpty() )
{
return false;
}
@@ -248,15 +248,15 @@ bool TrackContainer::isEmpty() const
AutomatedValueMap TrackContainer::automatedValuesAt(TimePos time, int tcoNum) const
AutomatedValueMap TrackContainer::automatedValuesAt(TimePos time, int clipNum) const
{
return automatedValuesFromTracks(tracks(), time, tcoNum);
return automatedValuesFromTracks(tracks(), time, clipNum);
}
AutomatedValueMap TrackContainer::automatedValuesFromTracks(const TrackList &tracks, TimePos time, int tcoNum)
AutomatedValueMap TrackContainer::automatedValuesFromTracks(const TrackList &tracks, TimePos time, int clipNum)
{
Track::tcoVector tcos;
Track::clipVector clips;
for (Track* track: tracks)
{
@@ -269,11 +269,11 @@ AutomatedValueMap TrackContainer::automatedValuesFromTracks(const TrackList &tra
case Track::AutomationTrack:
case Track::HiddenAutomationTrack:
case Track::BBTrack:
if (tcoNum < 0) {
track->getTCOsInRange(tcos, 0, time);
if (clipNum < 0) {
track->getClipsInRange(clips, 0, time);
} else {
Q_ASSERT(track->numOfTCOs() > tcoNum);
tcos << track->getTCO(tcoNum);
Q_ASSERT(track->numOfClips() > clipNum);
clips << track->getClip(clipNum);
}
default:
break;
@@ -282,15 +282,15 @@ AutomatedValueMap TrackContainer::automatedValuesFromTracks(const TrackList &tra
AutomatedValueMap valueMap;
Q_ASSERT(std::is_sorted(tcos.begin(), tcos.end(), TrackContentObject::comparePosition));
Q_ASSERT(std::is_sorted(clips.begin(), clips.end(), Clip::comparePosition));
for(TrackContentObject* tco : tcos)
for(Clip* clip : clips)
{
if (tco->isMuted() || tco->startPosition() > time) {
if (clip->isMuted() || clip->startPosition() > time) {
continue;
}
if (auto* p = dynamic_cast<AutomationPattern *>(tco))
if (auto* p = dynamic_cast<AutomationClip *>(clip))
{
if (! p->hasAutomation()) {
continue;
@@ -306,13 +306,13 @@ AutomatedValueMap TrackContainer::automatedValuesFromTracks(const TrackList &tra
valueMap[model] = value;
}
}
else if (auto* bb = dynamic_cast<BBTCO *>(tco))
else if (auto* bb = dynamic_cast<BBClip *>(clip))
{
auto bbIndex = dynamic_cast<class BBTrack*>(bb->getTrack())->index();
auto bbContainer = Engine::getBBTrackContainer();
TimePos bbTime = time - tco->startPosition();
bbTime = std::min(bbTime, tco->length());
TimePos bbTime = time - clip->startPosition();
bbTime = std::min(bbTime, clip->length());
bbTime = bbTime % (bbContainer->lengthOfBB(bbIndex) * TimePos::ticksPerBar());
auto bbValues = bbContainer->automatedValuesAt(bbTime, bbIndex);

6
src/gui/AutomatableModelView.cpp
View File

@@ -27,7 +27,7 @@
#include <QMouseEvent>
#include "AutomatableModelView.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "ControllerConnectionDialog.h"
#include "ControllerConnection.h"
#include "embed.h"
@@ -261,7 +261,7 @@ void AutomatableModelViewSlots::removeConnection()
void AutomatableModelViewSlots::editSongGlobalAutomation()
{
getGUI()->automationEditor()->open(
AutomationPattern::globalAutomationPattern(m_amv->modelUntyped())
AutomationClip::globalAutomationClip(m_amv->modelUntyped())
);
}
@@ -269,7 +269,7 @@ void AutomatableModelViewSlots::editSongGlobalAutomation()
void AutomatableModelViewSlots::removeSongGlobalAutomation()
{
delete AutomationPattern::globalAutomationPattern( m_amv->modelUntyped() );
delete AutomationClip::globalAutomationClip( m_amv->modelUntyped() );
}

182
src/gui/AutomationPatternView.cpp → src/gui/AutomationClipView.cpp
View File

@@ -1,5 +1,5 @@
/*
* AutomationPatternView.cpp - implementation of view for AutomationPattern
* AutomationClipView.cpp - implementation of view for AutomationClip
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -21,7 +21,7 @@
* Boston, MA 02110-1301 USA.
*
*/
#include "AutomationPatternView.h"
#include "AutomationClipView.h"
#include <QMouseEvent>
#include <QPainter>
@@ -41,26 +41,26 @@
#include "Engine.h"
QPixmap * AutomationPatternView::s_pat_rec = nullptr;
QPixmap * AutomationClipView::s_clip_rec = nullptr;
AutomationPatternView::AutomationPatternView( AutomationPattern * _pattern,
AutomationClipView::AutomationClipView( AutomationClip * _clip,
TrackView * _parent ) :
TrackContentObjectView( _pattern, _parent ),
m_pat( _pattern ),
ClipView( _clip, _parent ),
m_clip( _clip ),
m_paintPixmap()
{
connect( m_pat, SIGNAL( dataChanged() ),
connect( m_clip, SIGNAL( dataChanged() ),
this, SLOT( update() ) );
connect( getGUI()->automationEditor(), SIGNAL( currentPatternChanged() ),
connect( getGUI()->automationEditor(), SIGNAL( currentClipChanged() ),
this, SLOT( update() ) );
setAttribute( Qt::WA_OpaquePaintEvent, true );
ToolTip::add(this, m_pat->name());
ToolTip::add(this, m_clip->name());
setStyle( QApplication::style() );
if( s_pat_rec == nullptr ) { s_pat_rec = new QPixmap( embed::getIconPixmap(
"pat_rec" ) ); }
if( s_clip_rec == nullptr ) { s_clip_rec = new QPixmap( embed::getIconPixmap(
"clip_rec" ) ); }
update();
}
@@ -68,71 +68,71 @@ AutomationPatternView::AutomationPatternView( AutomationPattern * _pattern,
AutomationPatternView::~AutomationPatternView()
AutomationClipView::~AutomationClipView()
{
}
void AutomationPatternView::openInAutomationEditor()
void AutomationClipView::openInAutomationEditor()
{
if(getGUI() != nullptr)
getGUI()->automationEditor()->open(m_pat);
getGUI()->automationEditor()->open(m_clip);
}
void AutomationPatternView::update()
void AutomationClipView::update()
{
ToolTip::add(this, m_pat->name());
ToolTip::add(this, m_clip->name());
TrackContentObjectView::update();
ClipView::update();
}
void AutomationPatternView::resetName()
void AutomationClipView::resetName()
{
m_pat->setName( QString() );
m_clip->setName( QString() );
}
void AutomationPatternView::changeName()
void AutomationClipView::changeName()
{
QString s = m_pat->name();
QString s = m_clip->name();
RenameDialog rename_dlg( s );
rename_dlg.exec();
m_pat->setName( s );
m_clip->setName( s );
update();
}
void AutomationPatternView::disconnectObject( QAction * _a )
void AutomationClipView::disconnectObject( QAction * _a )
{
JournallingObject * j = Engine::projectJournal()->
journallingObject( _a->data().toInt() );
if( j && dynamic_cast<AutomatableModel *>( j ) )
{
float oldMin = m_pat->getMin();
float oldMax = m_pat->getMax();
float oldMin = m_clip->getMin();
float oldMax = m_clip->getMax();
m_pat->m_objects.erase( std::find( m_pat->m_objects.begin(),
m_pat->m_objects.end(),
m_clip->m_objects.erase( std::find( m_clip->m_objects.begin(),
m_clip->m_objects.end(),
dynamic_cast<AutomatableModel *>( j ) ) );
update();
//If automation editor is opened, update its display after disconnection
if( getGUI()->automationEditor() )
{
getGUI()->automationEditor()->m_editor->updateAfterPatternChange();
getGUI()->automationEditor()->m_editor->updateAfterClipChange();
}
//if there is no more connection connected to the AutomationPattern
if( m_pat->m_objects.size() == 0 )
//if there is no more connection connected to the AutomationClip
if( m_clip->m_objects.size() == 0 )
{
//scale the points to fit the new min. and max. value
this->scaleTimemapToFit( oldMin, oldMax );
@@ -141,34 +141,34 @@ void AutomationPatternView::disconnectObject( QAction * _a )
}
void AutomationPatternView::toggleRecording()
void AutomationClipView::toggleRecording()
{
m_pat->setRecording( ! m_pat->isRecording() );
m_clip->setRecording( ! m_clip->isRecording() );
update();
}
void AutomationPatternView::flipY()
void AutomationClipView::flipY()
{
m_pat->flipY( m_pat->getMin(), m_pat->getMax() );
m_clip->flipY( m_clip->getMin(), m_clip->getMax() );
update();
}
void AutomationPatternView::flipX()
void AutomationClipView::flipX()
{
m_pat->flipX( m_pat->length() );
m_clip->flipX( m_clip->length() );
update();
}
void AutomationPatternView::constructContextMenu( QMenu * _cm )
void AutomationClipView::constructContextMenu( QMenu * _cm )
{
QAction * a = new QAction( embed::getIconPixmap( "automation" ),
tr( "Open in Automation editor" ), _cm );
@@ -179,7 +179,7 @@ void AutomationPatternView::constructContextMenu( QMenu * _cm )
_cm->addSeparator();
_cm->addAction( embed::getIconPixmap( "edit_erase" ),
tr( "Clear" ), m_pat, SLOT( clear() ) );
tr( "Clear" ), m_clip, SLOT( clear() ) );
_cm->addSeparator();
_cm->addAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ),
@@ -196,14 +196,14 @@ void AutomationPatternView::constructContextMenu( QMenu * _cm )
_cm->addAction( embed::getIconPixmap( "flip_x" ),
tr( "Flip Horizontally (Visible)" ),
this, SLOT( flipX() ) );
if( !m_pat->m_objects.isEmpty() )
if( !m_clip->m_objects.isEmpty() )
{
_cm->addSeparator();
QMenu * m = new QMenu( tr( "%1 Connections" ).
arg( m_pat->m_objects.count() ), _cm );
for( AutomationPattern::objectVector::iterator it =
m_pat->m_objects.begin();
it != m_pat->m_objects.end(); ++it )
arg( m_clip->m_objects.count() ), _cm );
for( AutomationClip::objectVector::iterator it =
m_clip->m_objects.begin();
it != m_clip->m_objects.end(); ++it )
{
if( *it )
{
@@ -222,7 +222,7 @@ void AutomationPatternView::constructContextMenu( QMenu * _cm )
void AutomationPatternView::mouseDoubleClickEvent( QMouseEvent * me )
void AutomationClipView::mouseDoubleClickEvent( QMouseEvent * me )
{
if(me->button() != Qt::LeftButton)
{
@@ -235,7 +235,7 @@ void AutomationPatternView::mouseDoubleClickEvent( QMouseEvent * me )
void AutomationPatternView::paintEvent( QPaintEvent * )
void AutomationClipView::paintEvent( QPaintEvent * )
{
QPainter painter( this );
@@ -256,13 +256,13 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
QLinearGradient lingrad( 0, 0, 0, height() );
QColor c = getColorForDisplay( painter.background().color() );
bool muted = m_pat->getTrack()->isMuted() || m_pat->isMuted();
bool current = getGUI()->automationEditor()->currentPattern() == m_pat;
bool muted = m_clip->getTrack()->isMuted() || m_clip->isMuted();
bool current = getGUI()->automationEditor()->currentClip() == m_clip;
lingrad.setColorAt( 1, c.darker( 300 ) );
lingrad.setColorAt( 0, c );
// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
// paint a black rectangle under the clip to prevent glitches with transparent backgrounds
p.fillRect( rect(), QColor( 0, 0, 0 ) );
if( gradient() )
@@ -275,19 +275,19 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
}
// pixels per bar
const float ppb = fixedTCOs() ?
( parentWidget()->width() - 2 * TCO_BORDER_WIDTH )
/ (float) m_pat->timeMapLength().getBar() :
const float ppb = fixedClips() ?
( parentWidget()->width() - 2 * CLIP_BORDER_WIDTH )
/ (float) m_clip->timeMapLength().getBar() :
pixelsPerBar();
const float min = m_pat->firstObject()->minValue<float>();
const float max = m_pat->firstObject()->maxValue<float>();
const float min = m_clip->firstObject()->minValue<float>();
const float max = m_clip->firstObject()->maxValue<float>();
const float y_scale = max - min;
const float h = ( height() - 2 * TCO_BORDER_WIDTH ) / y_scale;
const float h = ( height() - 2 * CLIP_BORDER_WIDTH ) / y_scale;
const float ppTick = ppb / TimePos::ticksPerBar();
p.translate( 0.0f, max * height() / y_scale - TCO_BORDER_WIDTH );
p.translate( 0.0f, max * height() / y_scale - CLIP_BORDER_WIDTH );
p.scale( 1.0f, -h );
QLinearGradient lin2grad( 0, min, 0, max );
@@ -300,15 +300,15 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
lin2grad.setColorAt( 0, col.darker( 150 ) );
p.setRenderHints( QPainter::Antialiasing, true );
for( AutomationPattern::timeMap::const_iterator it =
m_pat->getTimeMap().begin();
it != m_pat->getTimeMap().end(); ++it )
for( AutomationClip::timeMap::const_iterator it =
m_clip->getTimeMap().begin();
it != m_clip->getTimeMap().end(); ++it )
{
if( it+1 == m_pat->getTimeMap().end() )
if( it+1 == m_clip->getTimeMap().end() )
{
const float x1 = POS(it) * ppTick;
const float x2 = (float)( width() - TCO_BORDER_WIDTH );
if( x1 > ( width() - TCO_BORDER_WIDTH ) ) break;
const float x2 = (float)( width() - CLIP_BORDER_WIDTH );
if( x1 > ( width() - CLIP_BORDER_WIDTH ) ) break;
// We are drawing the space after the last node, so we use the outValue
if( gradient() )
{
@@ -321,7 +321,7 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
break;
}
float *values = m_pat->valuesAfter(POS(it));
float *values = m_clip->valuesAfter(POS(it));
// We are creating a path to draw a polygon representing the values between two
// nodes. When we have two nodes with discrete progression, we will basically have
@@ -330,7 +330,7 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
// the value of the end of the shape between the two nodes will be the inValue of
// the next node.
float nextValue;
if( m_pat->progressionType() == AutomationPattern::DiscreteProgression )
if( m_clip->progressionType() == AutomationClip::DiscreteProgression )
{
nextValue = OUTVAL(it);
}
@@ -347,7 +347,7 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
for (int i = POS(it) + 1; i < POS(it + 1); i++)
{
x = i * ppTick;
if( x > ( width() - TCO_BORDER_WIDTH ) ) break;
if( x > ( width() - CLIP_BORDER_WIDTH ) ) break;
float value = values[i - POS(it)];
path.lineTo( QPointF( x, value ) );
@@ -374,39 +374,39 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
const int lineSize = 3;
p.setPen( c.darker( 300 ) );
for (bar_t b = 1; b < width() - TCO_BORDER_WIDTH; ++b)
for (bar_t b = 1; b < width() - CLIP_BORDER_WIDTH; ++b)
{
const int bx = TCO_BORDER_WIDTH + static_cast<int>(ppb * b) - 2;
const int bx = CLIP_BORDER_WIDTH + static_cast<int>(ppb * b) - 2;
//top line
p.drawLine(bx, TCO_BORDER_WIDTH, bx, TCO_BORDER_WIDTH + lineSize);
p.drawLine(bx, CLIP_BORDER_WIDTH, bx, CLIP_BORDER_WIDTH + lineSize);
//bottom line
p.drawLine(bx, rect().bottom() - (lineSize + TCO_BORDER_WIDTH), bx, rect().bottom() - TCO_BORDER_WIDTH);
p.drawLine(bx, rect().bottom() - (lineSize + CLIP_BORDER_WIDTH), bx, rect().bottom() - CLIP_BORDER_WIDTH);
}
// recording icon for when recording automation
if( m_pat->isRecording() )
if( m_clip->isRecording() )
{
p.drawPixmap( 1, rect().bottom() - s_pat_rec->height(), *s_pat_rec );
p.drawPixmap( 1, rect().bottom() - s_clip_rec->height(), *s_clip_rec );
}
// pattern name
paintTextLabel(m_pat->name(), p);
// clip name
paintTextLabel(m_clip->name(), p);
// inner border
p.setPen( c.lighter( current ? 160 : 130 ) );
p.drawRect( 1, 1, rect().right() - TCO_BORDER_WIDTH,
rect().bottom() - TCO_BORDER_WIDTH );
p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
rect().bottom() - CLIP_BORDER_WIDTH );
// outer border
p.setPen( current? c.lighter( 130 ) : c.darker( 300 ) );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
// draw the 'muted' pixmap only if the pattern was manualy muted
if( m_pat->isMuted() )
// draw the 'muted' pixmap only if the clip was manualy muted
if( m_clip->isMuted() )
{
const int spacing = TCO_BORDER_WIDTH;
const int spacing = CLIP_BORDER_WIDTH;
const int size = 14;
p.drawPixmap( spacing, height() - ( size + spacing ),
embed::getIconPixmap( "muted", size, size ) );
@@ -420,19 +420,19 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
void AutomationPatternView::dragEnterEvent( QDragEnterEvent * _dee )
void AutomationClipView::dragEnterEvent( QDragEnterEvent * _dee )
{
StringPairDrag::processDragEnterEvent( _dee, "automatable_model" );
if( !_dee->isAccepted() )
{
TrackContentObjectView::dragEnterEvent( _dee );
ClipView::dragEnterEvent( _dee );
}
}
void AutomationPatternView::dropEvent( QDropEvent * _de )
void AutomationClipView::dropEvent( QDropEvent * _de )
{
QString type = StringPairDrag::decodeKey( _de );
QString val = StringPairDrag::decodeValue( _de );
@@ -443,12 +443,12 @@ void AutomationPatternView::dropEvent( QDropEvent * _de )
journallingObject( val.toInt() ) );
if( mod != nullptr )
{
bool added = m_pat->addObject( mod );
bool added = m_clip->addObject( mod );
if ( !added )
{
TextFloat::displayMessage( mod->displayName(),
tr( "Model is already connected "
"to this pattern." ),
"to this clip." ),
embed::getIconPixmap( "automation" ),
2000 );
}
@@ -456,14 +456,14 @@ void AutomationPatternView::dropEvent( QDropEvent * _de )
update();
if( getGUI()->automationEditor() &&
getGUI()->automationEditor()->currentPattern() == m_pat )
getGUI()->automationEditor()->currentClip() == m_clip )
{
getGUI()->automationEditor()->setCurrentPattern( m_pat );
getGUI()->automationEditor()->setCurrentClip( m_clip );
}
}
else
{
TrackContentObjectView::dropEvent( _de );
ClipView::dropEvent( _de );
}
}
@@ -473,10 +473,10 @@ void AutomationPatternView::dropEvent( QDropEvent * _de )
/**
* @brief Preserves the auto points over different scale
*/
void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax )
void AutomationClipView::scaleTimemapToFit( float oldMin, float oldMax )
{
float newMin = m_pat->getMin();
float newMax = m_pat->getMax();
float newMin = m_clip->getMin();
float newMax = m_clip->getMax();
if( oldMin == newMin && oldMax == newMax )
{
@@ -487,8 +487,8 @@ void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax )
// only the inValue is being considered and the outValue is being reset to the inValue (so discrete jumps
// are discarded). Possibly later we will want discrete jumps to be maintained so we will need to upgrade
// the logic to account for them.
for( AutomationPattern::timeMap::iterator it = m_pat->m_timeMap.begin();
it != m_pat->m_timeMap.end(); ++it )
for( AutomationClip::timeMap::iterator it = m_clip->m_timeMap.begin();
it != m_clip->m_timeMap.end(); ++it )
{
// If the values are out of the previous range, fix them so they are
// between oldMin and oldMax.
@@ -506,5 +506,5 @@ void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax )
it.value().setOutValue(INVAL(it));
}
m_pat->generateTangents();
m_clip->generateTangents();
}

8
src/gui/AutomationTrackView.cpp
View File

@@ -25,7 +25,7 @@
#include "AutomationTrackView.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "embed.h"
#include "Engine.h"
#include "ProjectJournal.h"
@@ -78,9 +78,9 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
pos.setTicks( 0 );
}
TrackContentObject * tco = getTrack()->createTCO( pos );
AutomationPattern * pat = dynamic_cast<AutomationPattern *>( tco );
pat->addObject( mod );
Clip * clip = getTrack()->createClip( pos );
AutomationClip * autoClip = dynamic_cast<AutomationClip *>( clip );
autoClip->addObject( mod );
}
}

62
src/gui/BBTCOView.cpp → src/gui/BBClipView.cpp
View File

@@ -1,5 +1,5 @@
/*
* BBTCOView.cpp
* BBClipView.cpp
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -22,7 +22,7 @@
*
*/
#include "BBTCOView.h"
#include "BBClipView.h"
#include <QMenu>
#include <QPainter>
@@ -36,18 +36,18 @@
#include "Song.h"
#include "ToolTip.h"
BBTCOView::BBTCOView( TrackContentObject * _tco, TrackView * _tv ) :
TrackContentObjectView( _tco, _tv ),
m_bbTCO( dynamic_cast<BBTCO *>( _tco ) ),
BBClipView::BBClipView( Clip * _clip, TrackView * _tv ) :
ClipView( _clip, _tv ),
m_bbClip( dynamic_cast<BBClip *>( _clip ) ),
m_paintPixmap()
{
connect( _tco->getTrack(), SIGNAL( dataChanged() ),
connect( _clip->getTrack(), SIGNAL( dataChanged() ),
this, SLOT( update() ) );
setStyle( QApplication::style() );
}
void BBTCOView::constructContextMenu( QMenu * _cm )
void BBClipView::constructContextMenu( QMenu * _cm )
{
QAction * a = new QAction( embed::getIconPixmap( "bb_track" ),
tr( "Open in Beat+Bassline-Editor" ),
@@ -67,7 +67,7 @@ void BBTCOView::constructContextMenu( QMenu * _cm )
void BBTCOView::mouseDoubleClickEvent( QMouseEvent * )
void BBClipView::mouseDoubleClickEvent( QMouseEvent * )
{
openInBBEditor();
}
@@ -75,7 +75,7 @@ void BBTCOView::mouseDoubleClickEvent( QMouseEvent * )
void BBTCOView::paintEvent( QPaintEvent * )
void BBClipView::paintEvent( QPaintEvent * )
{
QPainter painter( this );
@@ -100,7 +100,7 @@ void BBTCOView::paintEvent( QPaintEvent * )
lingrad.setColorAt( 0, c.lighter( 130 ) );
lingrad.setColorAt( 1, c.lighter( 70 ) );
// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
// paint a black rectangle under the clip to prevent glitches with transparent backgrounds
p.fillRect( rect(), QColor( 0, 0, 0 ) );
if( gradient() )
@@ -116,35 +116,35 @@ void BBTCOView::paintEvent( QPaintEvent * )
const int lineSize = 3;
p.setPen( c.darker( 200 ) );
bar_t t = Engine::getBBTrackContainer()->lengthOfBB( m_bbTCO->bbTrackIndex() );
if( m_bbTCO->length() > TimePos::ticksPerBar() && t > 0 )
bar_t t = Engine::getBBTrackContainer()->lengthOfBB( m_bbClip->bbTrackIndex() );
if( m_bbClip->length() > TimePos::ticksPerBar() && t > 0 )
{
for( int x = static_cast<int>( t * pixelsPerBar() );
x < width() - 2;
x += static_cast<int>( t * pixelsPerBar() ) )
{
p.drawLine( x, TCO_BORDER_WIDTH, x, TCO_BORDER_WIDTH + lineSize );
p.drawLine( x, rect().bottom() - ( TCO_BORDER_WIDTH + lineSize ),
x, rect().bottom() - TCO_BORDER_WIDTH );
p.drawLine( x, CLIP_BORDER_WIDTH, x, CLIP_BORDER_WIDTH + lineSize );
p.drawLine( x, rect().bottom() - ( CLIP_BORDER_WIDTH + lineSize ),
x, rect().bottom() - CLIP_BORDER_WIDTH );
}
}
// pattern name
paintTextLabel(m_bbTCO->name(), p);
// clip name
paintTextLabel(m_bbClip->name(), p);
// inner border
p.setPen( c.lighter( 130 ) );
p.drawRect( 1, 1, rect().right() - TCO_BORDER_WIDTH,
rect().bottom() - TCO_BORDER_WIDTH );
p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
rect().bottom() - CLIP_BORDER_WIDTH );
// outer border
p.setPen( c.darker( 300 ) );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
// draw the 'muted' pixmap only if the pattern was manualy muted
if( m_bbTCO->isMuted() )
// draw the 'muted' pixmap only if the clip was manualy muted
if( m_bbClip->isMuted() )
{
const int spacing = TCO_BORDER_WIDTH;
const int spacing = CLIP_BORDER_WIDTH;
const int size = 14;
p.drawPixmap( spacing, height() - ( size + spacing ),
embed::getIconPixmap( "muted", size, size ) );
@@ -158,9 +158,9 @@ void BBTCOView::paintEvent( QPaintEvent * )
void BBTCOView::openInBBEditor()
void BBClipView::openInBBEditor()
{
Engine::getBBTrackContainer()->setCurrentBB( m_bbTCO->bbTrackIndex() );
Engine::getBBTrackContainer()->setCurrentBB( m_bbClip->bbTrackIndex() );
getGUI()->mainWindow()->toggleBBEditorWin( true );
}
@@ -168,24 +168,24 @@ void BBTCOView::openInBBEditor()
void BBTCOView::resetName() { m_bbTCO->setName(""); }
void BBClipView::resetName() { m_bbClip->setName(""); }
void BBTCOView::changeName()
void BBClipView::changeName()
{
QString s = m_bbTCO->name();
QString s = m_bbClip->name();
RenameDialog rename_dlg( s );
rename_dlg.exec();
m_bbTCO->setName( s );
m_bbClip->setName( s );
}
void BBTCOView::update()
void BBClipView::update()
{
ToolTip::add(this, m_bbTCO->name());
ToolTip::add(this, m_bbClip->name());
TrackContentObjectView::update();
ClipView::update();
}

10
src/gui/CMakeLists.txt
View File

@@ -5,11 +5,11 @@ SET(LMMS_SRCS
gui/AudioAlsaSetupWidget.cpp
gui/AudioDeviceSetupWidget.cpp
gui/AutomatableModelView.cpp
gui/AutomationPatternView.cpp
gui/AutomationClipView.cpp
gui/AutomationTrackView.cpp
gui/ControllerConnectionDialog.cpp
gui/ControllerDialog.cpp
gui/BBTCOView.cpp
gui/BBClipView.cpp
gui/BBTrackView.cpp
gui/EffectControlDialog.cpp
gui/EffectSelectDialog.cpp
@@ -28,14 +28,14 @@ SET(LMMS_SRCS
gui/MainApplication.cpp
gui/MainWindow.cpp
gui/MidiCCRackView.cpp
gui/MidiClipView.cpp
gui/MidiSetupWidget.cpp
gui/ModelView.cpp
gui/PatternView.cpp
gui/PeakControllerDialog.cpp
gui/PianoView.cpp
gui/PluginBrowser.cpp
gui/RowTableView.cpp
gui/SampleTCOView.cpp
gui/SampleClipView.cpp
gui/SampleTrackView.cpp
gui/SampleTrackWindow.cpp
gui/SetupDialog.cpp
@@ -44,7 +44,7 @@ SET(LMMS_SRCS
gui/TimeLineWidget.cpp
gui/ToolPluginView.cpp
gui/TrackContainerView.cpp
gui/TrackContentObjectView.cpp
gui/ClipView.cpp
gui/TrackView.cpp
gui/dialogs/FileDialog.cpp

727
src/gui/TrackContentObjectView.cpp → src/gui/ClipView.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/gui/FileBrowser.cpp
View File

@@ -859,7 +859,7 @@ bool FileBrowserTreeWidget::openInNewSampleTrack(FileItem* item)
// Add the sample clip to the track
Engine::audioEngine()->requestChangeInModel();
SampleTCO* clip = static_cast<SampleTCO*>(sampleTrack->createTCO(0));
SampleClip* clip = static_cast<SampleClip*>(sampleTrack->createClip(0));
clip->setSampleFile(item->fullName());
Engine::audioEngine()->doneChangeInModel();
return true;

6
src/gui/LmmsStyle.cpp
View File

@@ -45,11 +45,11 @@ QLinearGradient getGradient( const QColor & _col, const QRectF & _rect )
qreal saturation = _col.saturationF();
QColor c = _col;
c.setHsvF( hue, 0.42 * saturation, 0.98 * value ); // TODO: pattern: 1.08
c.setHsvF( hue, 0.42 * saturation, 0.98 * value ); // TODO: MIDI clip: 1.08
g.setColorAt( 0, c );
c.setHsvF( hue, 0.58 * saturation, 0.95 * value ); // TODO: pattern: 1.05
c.setHsvF( hue, 0.58 * saturation, 0.95 * value ); // TODO: MIDI clip: 1.05
g.setColorAt( 0.25, c );
c.setHsvF( hue, 0.70 * saturation, 0.93 * value ); // TODO: pattern: 1.03
c.setHsvF( hue, 0.70 * saturation, 0.93 * value ); // TODO: MIDI clip: 1.03
g.setColorAt( 0.5, c );
c.setHsvF( hue, 0.95 * saturation, 0.9 * value );

6
src/gui/MainWindow.cpp
View File

@@ -1131,6 +1131,8 @@ void MainWindow::toggleMicrotunerWin()
}
void MainWindow::updateViewMenu()
{
m_viewMenu->clear();
@@ -1288,7 +1290,7 @@ void MainWindow::updatePlayPauseIcons()
getGUI()->songEditor()->setPauseIcon( true );
break;
case Song::Mode_PlayAutomationPattern:
case Song::Mode_PlayAutomationClip:
getGUI()->automationEditor()->setPauseIcon( true );
break;
@@ -1296,7 +1298,7 @@ void MainWindow::updatePlayPauseIcons()
getGUI()->getBBEditor()->setPauseIcon( true );
break;
case Song::Mode_PlayPattern:
case Song::Mode_PlayMidiClip:
getGUI()->pianoRoll()->setPauseIcon( true );
break;

198
src/gui/PatternView.cpp → src/gui/MidiClipView.cpp
View File

@@ -1,5 +1,5 @@
/*
* Pattern.cpp - implementation of class pattern which holds notes
* MidiClipView.cpp - implementation of class MidiClipView which displays notes
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2007 Danny McRae <khjklujn/at/yahoo.com>
@@ -23,7 +23,7 @@
*
*/
#include "PatternView.h"
#include "MidiClipView.h"
#include <QApplication>
#include <QMenu>
@@ -35,9 +35,9 @@
#include "PianoRoll.h"
#include "RenameDialog.h"
PatternView::PatternView( Pattern* pattern, TrackView* parent ) :
TrackContentObjectView( pattern, parent ),
m_pat( pattern ),
MidiClipView::MidiClipView( MidiClip* clip, TrackView* parent ) :
ClipView( clip, parent ),
m_clip( clip ),
m_paintPixmap(),
m_noteFillColor(255, 255, 255, 220),
m_noteBorderColor(255, 255, 255, 220),
@@ -45,7 +45,7 @@ PatternView::PatternView( Pattern* pattern, TrackView* parent ) :
m_mutedNoteBorderColor(100, 100, 100, 220),
m_legacySEBB(ConfigManager::inst()->value("ui","legacysebb","0").toInt())
{
connect( getGUI()->pianoRoll(), SIGNAL( currentPatternChanged() ),
connect( getGUI()->pianoRoll(), SIGNAL( currentMidiClipChanged() ),
this, SLOT( update() ) );
if( s_stepBtnOn0 == nullptr )
@@ -80,27 +80,27 @@ PatternView::PatternView( Pattern* pattern, TrackView* parent ) :
Pattern* PatternView::getPattern()
MidiClip* MidiClipView::getMidiClip()
{
return m_pat;
return m_clip;
}
void PatternView::update()
void MidiClipView::update()
{
ToolTip::add(this, m_pat->name());
ToolTip::add(this, m_clip->name());
TrackContentObjectView::update();
ClipView::update();
}
void PatternView::openInPianoRoll()
void MidiClipView::openInPianoRoll()
{
getGUI()->pianoRoll()->setCurrentPattern( m_pat );
getGUI()->pianoRoll()->setCurrentMidiClip( m_clip );
getGUI()->pianoRoll()->parentWidget()->show();
getGUI()->pianoRoll()->show();
getGUI()->pianoRoll()->setFocus();
@@ -110,9 +110,9 @@ void PatternView::openInPianoRoll()
void PatternView::setGhostInPianoRoll()
void MidiClipView::setGhostInPianoRoll()
{
getGUI()->pianoRoll()->setGhostPattern( m_pat );
getGUI()->pianoRoll()->setGhostMidiClip( m_clip );
getGUI()->pianoRoll()->parentWidget()->show();
getGUI()->pianoRoll()->show();
getGUI()->pianoRoll()->setFocus();
@@ -121,23 +121,23 @@ void PatternView::setGhostInPianoRoll()
void PatternView::resetName() { m_pat->setName(""); }
void MidiClipView::resetName() { m_clip->setName(""); }
void PatternView::changeName()
void MidiClipView::changeName()
{
QString s = m_pat->name();
QString s = m_clip->name();
RenameDialog rename_dlg( s );
rename_dlg.exec();
m_pat->setName( s );
m_clip->setName( s );
}
void PatternView::constructContextMenu( QMenu * _cm )
void MidiClipView::constructContextMenu( QMenu * _cm )
{
QAction * a = new QAction( embed::getIconPixmap( "piano" ),
tr( "Open in piano-roll" ), _cm );
@@ -147,7 +147,7 @@ void PatternView::constructContextMenu( QMenu * _cm )
QAction * b = new QAction( embed::getIconPixmap( "ghost_note" ),
tr( "Set as ghost in piano-roll" ), _cm );
if( m_pat->empty() ) { b->setEnabled( false ); }
if( m_clip->empty() ) { b->setEnabled( false ); }
_cm->insertAction( _cm->actions()[1], b );
connect( b, SIGNAL( triggered( bool ) ),
this, SLOT( setGhostInPianoRoll() ) );
@@ -155,7 +155,7 @@ void PatternView::constructContextMenu( QMenu * _cm )
_cm->addSeparator();
_cm->addAction( embed::getIconPixmap( "edit_erase" ),
tr( "Clear all notes" ), m_pat, SLOT( clear() ) );
tr( "Clear all notes" ), m_clip, SLOT( clear() ) );
_cm->addSeparator();
_cm->addAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ),
@@ -164,27 +164,27 @@ void PatternView::constructContextMenu( QMenu * _cm )
tr( "Change name" ),
this, SLOT( changeName() ) );
if ( m_pat->type() == Pattern::BeatPattern )
if ( m_clip->type() == MidiClip::BeatClip )
{
_cm->addSeparator();
_cm->addAction( embed::getIconPixmap( "step_btn_add" ),
tr( "Add steps" ), m_pat, SLOT( addSteps() ) );
tr( "Add steps" ), m_clip, SLOT( addSteps() ) );
_cm->addAction( embed::getIconPixmap( "step_btn_remove" ),
tr( "Remove steps" ), m_pat, SLOT( removeSteps() ) );
tr( "Remove steps" ), m_clip, SLOT( removeSteps() ) );
_cm->addAction( embed::getIconPixmap( "step_btn_duplicate" ),
tr( "Clone Steps" ), m_pat, SLOT( cloneSteps() ) );
tr( "Clone Steps" ), m_clip, SLOT( cloneSteps() ) );
}
}
void PatternView::mousePressEvent( QMouseEvent * _me )
void MidiClipView::mousePressEvent( QMouseEvent * _me )
{
bool displayBB = fixedTCOs() || (pixelsPerBar() >= 96 && m_legacySEBB);
bool displayBB = fixedClips() || (pixelsPerBar() >= 96 && m_legacySEBB);
if( _me->button() == Qt::LeftButton &&
m_pat->m_patternType == Pattern::BeatPattern &&
m_clip->m_clipType == MidiClip::BeatClip &&
displayBB && _me->y() > height() - s_stepBtnOff->height() )
// when mouse button is pressed in beat/bassline -mode
@@ -192,36 +192,36 @@ void PatternView::mousePressEvent( QMouseEvent * _me )
{
// get the step number that was clicked on and
// do calculations in floats to prevent rounding errors...
float tmp = ( ( float(_me->x()) - TCO_BORDER_WIDTH ) *
float( m_pat -> m_steps ) ) / float(width() - TCO_BORDER_WIDTH*2);
float tmp = ( ( float(_me->x()) - CLIP_BORDER_WIDTH ) *
float( m_clip -> m_steps ) ) / float(width() - CLIP_BORDER_WIDTH*2);
int step = int( tmp );
// debugging to ensure we get the correct step...
// qDebug( "Step (%f) %d", tmp, step );
if( step >= m_pat->m_steps )
if( step >= m_clip->m_steps )
{
qDebug( "Something went wrong in pattern.cpp: step %d doesn't exist in pattern!", step );
qDebug( "Something went wrong in clip.cpp: step %d doesn't exist in clip!", step );
return;
}
Note * n = m_pat->noteAtStep( step );
Note * n = m_clip->noteAtStep( step );
if( n == nullptr )
{
m_pat->addStepNote( step );
m_clip->addStepNote( step );
}
else // note at step found
{
m_pat->addJournalCheckPoint();
m_pat->setStep( step, false );
m_clip->addJournalCheckPoint();
m_clip->setStep( step, false );
}
Engine::getSong()->setModified();
update();
if( getGUI()->pianoRoll()->currentPattern() == m_pat )
if( getGUI()->pianoRoll()->currentMidiClip() == m_clip )
{
getGUI()->pianoRoll()->update();
}
@@ -231,18 +231,18 @@ void PatternView::mousePressEvent( QMouseEvent * _me )
// if not in beat/bassline -mode, let parent class handle the event
{
TrackContentObjectView::mousePressEvent( _me );
ClipView::mousePressEvent( _me );
}
}
void PatternView::mouseDoubleClickEvent(QMouseEvent *_me)
void MidiClipView::mouseDoubleClickEvent(QMouseEvent *_me)
{
if( _me->button() != Qt::LeftButton )
{
_me->ignore();
return;
}
if( m_pat->m_patternType == Pattern::MelodyPattern || !fixedTCOs() )
if( m_clip->m_clipType == MidiClip::MelodyClip || !fixedClips() )
{
openInPianoRoll();
}
@@ -251,28 +251,28 @@ void PatternView::mouseDoubleClickEvent(QMouseEvent *_me)
void PatternView::wheelEvent(QWheelEvent * we)
void MidiClipView::wheelEvent(QWheelEvent * we)
{
if(m_pat->m_patternType == Pattern::BeatPattern &&
(fixedTCOs() || pixelsPerBar() >= 96) &&
if(m_clip->m_clipType == MidiClip::BeatClip &&
(fixedClips() || pixelsPerBar() >= 96) &&
position(we).y() > height() - s_stepBtnOff->height())
{
// get the step number that was wheeled on and
// do calculations in floats to prevent rounding errors...
float tmp = ((float(position(we).x()) - TCO_BORDER_WIDTH) *
float(m_pat -> m_steps)) / float(width() - TCO_BORDER_WIDTH*2);
float tmp = ((float(position(we).x()) - CLIP_BORDER_WIDTH) *
float(m_clip -> m_steps)) / float(width() - CLIP_BORDER_WIDTH*2);
int step = int( tmp );
if( step >= m_pat->m_steps )
if( step >= m_clip->m_steps )
{
return;
}
Note * n = m_pat->noteAtStep( step );
Note * n = m_clip->noteAtStep( step );
if(!n && we->angleDelta().y() > 0)
{
n = m_pat->addStepNote( step );
n = m_clip->addStepNote( step );
n->setVolume( 0 );
}
if( n != nullptr )
@@ -290,7 +290,7 @@ void PatternView::wheelEvent(QWheelEvent * we)
Engine::getSong()->setModified();
update();
if( getGUI()->pianoRoll()->currentPattern() == m_pat )
if( getGUI()->pianoRoll()->currentMidiClip() == m_clip )
{
getGUI()->pianoRoll()->update();
}
@@ -299,7 +299,7 @@ void PatternView::wheelEvent(QWheelEvent * we)
}
else
{
TrackContentObjectView::wheelEvent(we);
ClipView::wheelEvent(we);
}
}
@@ -309,7 +309,7 @@ static int computeNoteRange(int minKey, int maxKey)
return (maxKey - minKey) + 1;
}
void PatternView::paintEvent( QPaintEvent * )
void MidiClipView::paintEvent( QPaintEvent * )
{
QPainter painter( this );
@@ -329,14 +329,14 @@ void PatternView::paintEvent( QPaintEvent * )
QPainter p( &m_paintPixmap );
QColor c;
bool const muted = m_pat->getTrack()->isMuted() || m_pat->isMuted();
bool current = getGUI()->pianoRoll()->currentPattern() == m_pat;
bool beatPattern = m_pat->m_patternType == Pattern::BeatPattern;
bool const muted = m_clip->getTrack()->isMuted() || m_clip->isMuted();
bool current = getGUI()->pianoRoll()->currentMidiClip() == m_clip;
bool beatClip = m_clip->m_clipType == MidiClip::BeatClip;
if( beatPattern )
if( beatClip )
{
// Do not paint BBTCOs how we paint pattern TCOs
c = BBPatternBackground();
// Do not paint BBClips how we paint MidiClips
c = BBClipBackground();
}
else
{
@@ -345,10 +345,10 @@ void PatternView::paintEvent( QPaintEvent * )
// invert the gradient for the background in the B&B editor
QLinearGradient lingrad( 0, 0, 0, height() );
lingrad.setColorAt( beatPattern ? 0 : 1, c.darker( 300 ) );
lingrad.setColorAt( beatPattern ? 1 : 0, c );
lingrad.setColorAt( beatClip ? 0 : 1, c.darker( 300 ) );
lingrad.setColorAt( beatClip ? 1 : 0, c );
// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
// paint a black rectangle under the clip to prevent glitches with transparent backgrounds
p.fillRect( rect(), QColor( 0, 0, 0 ) );
if( gradient() )
@@ -362,12 +362,12 @@ void PatternView::paintEvent( QPaintEvent * )
// Check whether we will paint a text box and compute its potential height
// This is needed so we can paint the notes underneath it.
bool const drawName = !m_pat->name().isEmpty();
bool const drawTextBox = !beatPattern && drawName;
bool const drawName = !m_clip->name().isEmpty();
bool const drawTextBox = !beatClip && drawName;
// TODO Warning! This might cause problems if TrackContentObjectView::paintTextLabel changes
// TODO Warning! This might cause problems if ClipView::paintTextLabel changes
int textBoxHeight = 0;
const int textTop = TCO_BORDER_WIDTH + 1;
const int textTop = CLIP_BORDER_WIDTH + 1;
if (drawTextBox)
{
QFont labelFont = this->font();
@@ -378,22 +378,22 @@ void PatternView::paintEvent( QPaintEvent * )
}
// Compute pixels per bar
const int baseWidth = fixedTCOs() ? parentWidget()->width() - 2 * TCO_BORDER_WIDTH
: width() - TCO_BORDER_WIDTH;
const float pixelsPerBar = baseWidth / (float) m_pat->length().getBar();
const int baseWidth = fixedClips() ? parentWidget()->width() - 2 * CLIP_BORDER_WIDTH
: width() - CLIP_BORDER_WIDTH;
const float pixelsPerBar = baseWidth / (float) m_clip->length().getBar();
// Length of one bar/beat in the [0,1] x [0,1] coordinate system
const float barLength = 1. / m_pat->length().getBar();
const float barLength = 1. / m_clip->length().getBar();
const float tickLength = barLength / TimePos::ticksPerBar();
const int x_base = TCO_BORDER_WIDTH;
const int x_base = CLIP_BORDER_WIDTH;
bool displayBB = fixedTCOs() || (pixelsPerBar >= 96 && m_legacySEBB);
// melody pattern paint event
NoteVector const & noteCollection = m_pat->m_notes;
if( m_pat->m_patternType == Pattern::MelodyPattern && !noteCollection.empty() )
bool displayBB = fixedClips() || (pixelsPerBar >= 96 && m_legacySEBB);
// melody clip paint event
NoteVector const & noteCollection = m_clip->m_notes;
if( m_clip->m_clipType == MidiClip::MelodyClip && !noteCollection.empty() )
{
// Compute the minimum and maximum key in the pattern
// Compute the minimum and maximum key in the clip
// so that we know how much there is to draw.
int maxKey = std::numeric_limits<int>::min();
int minKey = std::numeric_limits<int>::max();
@@ -456,7 +456,7 @@ void PatternView::paintEvent( QPaintEvent * )
// set colour based on mute status
QColor noteFillColor = muted ? getMutedNoteFillColor() : getNoteFillColor();
QColor noteBorderColor = muted ? getMutedNoteBorderColor()
: ( m_pat->hasColor() ? c.lighter( 200 ) : getNoteBorderColor() );
: ( m_clip->hasColor() ? c.lighter( 200 ) : getNoteBorderColor() );
bool const drawAsLines = height() < 64;
if (drawAsLines)
@@ -477,7 +477,7 @@ void PatternView::paintEvent( QPaintEvent * )
float const noteHeight = 1. / adjustedNoteRange;
// scan through all the notes and draw them on the pattern
// scan through all the notes and draw them on the clip
for (Note const * currentNote : noteCollection)
{
// Map to 0, 1, 2, ...
@@ -504,18 +504,18 @@ void PatternView::paintEvent( QPaintEvent * )
p.restore();
}
// beat pattern paint event
else if( beatPattern && displayBB )
// beat clip paint event
else if( beatClip && displayBB )
{
QPixmap stepon0;
QPixmap stepon200;
QPixmap stepoff;
QPixmap stepoffl;
const int steps = qMax( 1,
m_pat->m_steps );
const int w = width() - 2 * TCO_BORDER_WIDTH;
m_clip->m_steps );
const int w = width() - 2 * CLIP_BORDER_WIDTH;
// scale step graphics to fit the beat pattern length
// scale step graphics to fit the beat clip length
stepon0 = s_stepBtnOn0->scaled( w / steps,
s_stepBtnOn0->height(),
Qt::IgnoreAspectRatio,
@@ -533,12 +533,12 @@ void PatternView::paintEvent( QPaintEvent * )
Qt::IgnoreAspectRatio,
Qt::SmoothTransformation );
for( int it = 0; it < steps; it++ ) // go through all the steps in the beat pattern
for( int it = 0; it < steps; it++ ) // go through all the steps in the beat clip
{
Note * n = m_pat->noteAtStep( it );
Note * n = m_clip->noteAtStep( it );
// figure out x and y coordinates for step graphic
const int x = TCO_BORDER_WIDTH + static_cast<int>( it * w / steps );
const int x = CLIP_BORDER_WIDTH + static_cast<int>( it * w / steps );
const int y = height() - s_stepBtnOff->height() - 1;
if( n )
@@ -560,7 +560,7 @@ void PatternView::paintEvent( QPaintEvent * )
}
} // end for loop
// draw a transparent rectangle over muted patterns
// draw a transparent rectangle over muted clips
if ( muted )
{
p.setBrush( mutedBackgroundColor() );
@@ -573,39 +573,39 @@ void PatternView::paintEvent( QPaintEvent * )
const int lineSize = 3;
p.setPen( c.darker( 200 ) );
for( bar_t t = 1; t < m_pat->length().getBar(); ++t )
for( bar_t t = 1; t < m_clip->length().getBar(); ++t )
{
p.drawLine( x_base + static_cast<int>( pixelsPerBar * t ) - 1,
TCO_BORDER_WIDTH, x_base + static_cast<int>(
pixelsPerBar * t ) - 1, TCO_BORDER_WIDTH + lineSize );
CLIP_BORDER_WIDTH, x_base + static_cast<int>(
pixelsPerBar * t ) - 1, CLIP_BORDER_WIDTH + lineSize );
p.drawLine( x_base + static_cast<int>( pixelsPerBar * t ) - 1,
rect().bottom() - ( lineSize + TCO_BORDER_WIDTH ),
rect().bottom() - ( lineSize + CLIP_BORDER_WIDTH ),
x_base + static_cast<int>( pixelsPerBar * t ) - 1,
rect().bottom() - TCO_BORDER_WIDTH );
rect().bottom() - CLIP_BORDER_WIDTH );
}
// pattern name
// clip name
if (drawTextBox)
{
paintTextLabel(m_pat->name(), p);
paintTextLabel(m_clip->name(), p);
}
if( !( fixedTCOs() && beatPattern ) )
if( !( fixedClips() && beatClip ) )
{
// inner border
p.setPen( c.lighter( current ? 160 : 130 ) );
p.drawRect( 1, 1, rect().right() - TCO_BORDER_WIDTH,
rect().bottom() - TCO_BORDER_WIDTH );
p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
rect().bottom() - CLIP_BORDER_WIDTH );
// outer border
p.setPen( current ? c.lighter( 130 ) : c.darker( 300 ) );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
}
// draw the 'muted' pixmap only if the pattern was manually muted
if( m_pat->isMuted() )
// draw the 'muted' pixmap only if the clip was manually muted
if( m_clip->isMuted() )
{
const int spacing = TCO_BORDER_WIDTH;
const int spacing = CLIP_BORDER_WIDTH;
const int size = 14;
p.drawPixmap( spacing, height() - ( size + spacing ),
embed::getIconPixmap( "muted", size, size ) );

151
src/gui/SampleTCOView.cpp → src/gui/SampleClipView.cpp
View File

@@ -1,5 +1,5 @@
/*
* SampleTCOView.cpp
* SampleClipView.cpp
*
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -22,7 +22,7 @@
*
*/
#include "SampleTCOView.h"
#include "SampleClipView.h"
#include <QMenu>
#include <QPainter>
@@ -34,43 +34,42 @@
#include "StringPairDrag.h"
#include "ToolTip.h"
SampleTCOView::SampleTCOView( SampleTCO * _tco, TrackView * _tv ) :
TrackContentObjectView( _tco, _tv ),
m_tco( _tco ),
SampleClipView::SampleClipView( SampleClip * _clip, TrackView * _tv ) :
ClipView( _clip, _tv ),
m_clip( _clip ),
m_paintPixmap()
{
// update UI and tooltip
updateSample();
// track future changes of SampleTCO
connect(m_tco, SIGNAL(sampleChanged()), this, SLOT(updateSample()));
// track future changes of SampleClip
connect(m_clip, SIGNAL(sampleChanged()), this, SLOT(updateSample()));
connect(m_tco, SIGNAL(wasReversed()), this, SLOT(update()));
connect(m_clip, SIGNAL(wasReversed()), this, SLOT(update()));
setStyle( QApplication::style() );
}
void SampleTCOView::updateSample()
void SampleClipView::updateSample()
{
update();
// set tooltip to filename so that user can see what sample this
// sample-tco contains
ToolTip::add( this, ( m_tco->m_sampleBuffer->audioFile() != "" ) ?
PathUtil::toAbsolute(m_tco->m_sampleBuffer->audioFile()) :
// sample-clip contains
ToolTip::add( this, ( m_clip->m_sampleBuffer->audioFile() != "" ) ?
PathUtil::toAbsolute(m_clip->m_sampleBuffer->audioFile()) :
tr( "Double-click to open sample" ) );
}
void SampleTCOView::constructContextMenu(QMenu* cm)
void SampleClipView::constructContextMenu(QMenu* cm)
{
cm->addSeparator();
/*contextMenu.addAction( embed::getIconPixmap( "record" ),
tr( "Set/clear record" ),
m_tco, SLOT( toggleRecord() ) );*/
m_clip, SLOT( toggleRecord() ) );*/
cm->addAction(
embed::getIconPixmap("flip_x"),
@@ -85,12 +84,12 @@ void SampleTCOView::constructContextMenu(QMenu* cm)
void SampleTCOView::dragEnterEvent( QDragEnterEvent * _dee )
void SampleClipView::dragEnterEvent( QDragEnterEvent * _dee )
{
if( StringPairDrag::processDragEnterEvent( _dee,
"samplefile,sampledata" ) == false )
{
TrackContentObjectView::dragEnterEvent( _dee );
ClipView::dragEnterEvent( _dee );
}
}
@@ -99,85 +98,85 @@ void SampleTCOView::dragEnterEvent( QDragEnterEvent * _dee )
void SampleTCOView::dropEvent( QDropEvent * _de )
void SampleClipView::dropEvent( QDropEvent * _de )
{
if( StringPairDrag::decodeKey( _de ) == "samplefile" )
{
m_tco->setSampleFile( StringPairDrag::decodeValue( _de ) );
m_clip->setSampleFile( StringPairDrag::decodeValue( _de ) );
_de->accept();
}
else if( StringPairDrag::decodeKey( _de ) == "sampledata" )
{
m_tco->m_sampleBuffer->loadFromBase64(
m_clip->m_sampleBuffer->loadFromBase64(
StringPairDrag::decodeValue( _de ) );
m_tco->updateLength();
m_clip->updateLength();
update();
_de->accept();
Engine::getSong()->setModified();
}
else
{
TrackContentObjectView::dropEvent( _de );
ClipView::dropEvent( _de );
}
}
void SampleTCOView::mousePressEvent( QMouseEvent * _me )
void SampleClipView::mousePressEvent( QMouseEvent * _me )
{
if( _me->button() == Qt::LeftButton &&
_me->modifiers() & Qt::ControlModifier &&
_me->modifiers() & Qt::ShiftModifier )
{
m_tco->toggleRecord();
m_clip->toggleRecord();
}
else
{
if( _me->button() == Qt::MiddleButton && _me->modifiers() == Qt::ControlModifier )
{
SampleTCO * sTco = dynamic_cast<SampleTCO*>( getTrackContentObject() );
if( sTco )
SampleClip * sClip = dynamic_cast<SampleClip*>( getClip() );
if( sClip )
{
sTco->updateTrackTcos();
sClip->updateTrackClips();
}
}
TrackContentObjectView::mousePressEvent( _me );
ClipView::mousePressEvent( _me );
}
}
void SampleTCOView::mouseReleaseEvent(QMouseEvent *_me)
void SampleClipView::mouseReleaseEvent(QMouseEvent *_me)
{
if( _me->button() == Qt::MiddleButton && !_me->modifiers() )
{
SampleTCO * sTco = dynamic_cast<SampleTCO*>( getTrackContentObject() );
if( sTco )
SampleClip * sClip = dynamic_cast<SampleClip*>( getClip() );
if( sClip )
{
sTco->playbackPositionChanged();
sClip->playbackPositionChanged();
}
}
TrackContentObjectView::mouseReleaseEvent( _me );
ClipView::mouseReleaseEvent( _me );
}
void SampleTCOView::mouseDoubleClickEvent( QMouseEvent * )
void SampleClipView::mouseDoubleClickEvent( QMouseEvent * )
{
QString af = m_tco->m_sampleBuffer->openAudioFile();
QString af = m_clip->m_sampleBuffer->openAudioFile();
if ( af.isEmpty() ) {} //Don't do anything if no file is loaded
else if ( af == m_tco->m_sampleBuffer->audioFile() )
else if ( af == m_clip->m_sampleBuffer->audioFile() )
{ //Instead of reloading the existing file, just reset the size
int length = (int) ( m_tco->m_sampleBuffer->frames() / Engine::framesPerTick() );
m_tco->changeLength(length);
int length = (int) ( m_clip->m_sampleBuffer->frames() / Engine::framesPerTick() );
m_clip->changeLength(length);
}
else
{ //Otherwise load the new file as ususal
m_tco->setSampleFile( af );
m_clip->setSampleFile( af );
Engine::getSong()->setModified();
}
}
@@ -185,7 +184,7 @@ void SampleTCOView::mouseDoubleClickEvent( QMouseEvent * )
void SampleTCOView::paintEvent( QPaintEvent * pe )
void SampleClipView::paintEvent( QPaintEvent * pe )
{
QPainter painter( this );
@@ -204,7 +203,7 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
QPainter p( &m_paintPixmap );
bool muted = m_tco->getTrack()->isMuted() || m_tco->isMuted();
bool muted = m_clip->getTrack()->isMuted() || m_clip->isMuted();
bool selected = isSelected();
QLinearGradient lingrad(0, 0, 0, height());
@@ -215,7 +214,7 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
lingrad.setColorAt( 1, c.darker( 300 ) );
lingrad.setColorAt( 0, c );
// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
// paint a black rectangle under the clip to prevent glitches with transparent backgrounds
p.fillRect( rect(), QColor( 0, 0, 0 ) );
if( gradient() )
@@ -227,13 +226,13 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
p.fillRect( rect(), c );
}
auto tcoColor = m_tco->hasColor()
? (m_tco->usesCustomClipColor()
? m_tco->color()
: m_tco->getTrack()->color())
auto clipColor = m_clip->hasColor()
? (m_clip->usesCustomClipColor()
? m_clip->color()
: m_clip->getTrack()->color())
: painter.pen().brush().color();
p.setPen(tcoColor);
p.setPen(clipColor);
if (muted)
{
@@ -246,22 +245,22 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
p.setPen(p.pen().brush().color().darker(150));
}
const int spacing = TCO_BORDER_WIDTH + 1;
const float ppb = fixedTCOs() ?
( parentWidget()->width() - 2 * TCO_BORDER_WIDTH )
/ (float) m_tco->length().getBar() :
const int spacing = CLIP_BORDER_WIDTH + 1;
const float ppb = fixedClips() ?
( parentWidget()->width() - 2 * CLIP_BORDER_WIDTH )
/ (float) m_clip->length().getBar() :
pixelsPerBar();
float nom = Engine::getSong()->getTimeSigModel().getNumerator();
float den = Engine::getSong()->getTimeSigModel().getDenominator();
float ticksPerBar = DefaultTicksPerBar * nom / den;
float offset = m_tco->startTimeOffset() / ticksPerBar * pixelsPerBar();
float offset = m_clip->startTimeOffset() / ticksPerBar * pixelsPerBar();
QRect r = QRect( offset, spacing,
qMax( static_cast<int>( m_tco->sampleLength() * ppb / ticksPerBar ), 1 ), rect().bottom() - 2 * spacing );
m_tco->m_sampleBuffer->visualize( p, r, pe->rect() );
qMax( static_cast<int>( m_clip->sampleLength() * ppb / ticksPerBar ), 1 ), rect().bottom() - 2 * spacing );
m_clip->m_sampleBuffer->visualize( p, r, pe->rect() );
QString name = PathUtil::cleanName(m_tco->m_sampleBuffer->audioFile());
QString name = PathUtil::cleanName(m_clip->m_sampleBuffer->audioFile());
paintTextLabel(name, p);
// disable antialiasing for borders, since its not needed
@@ -269,17 +268,17 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
// inner border
p.setPen( c.lighter( 135 ) );
p.drawRect( 1, 1, rect().right() - TCO_BORDER_WIDTH,
rect().bottom() - TCO_BORDER_WIDTH );
p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
rect().bottom() - CLIP_BORDER_WIDTH );
// outer border
p.setPen( c.darker( 200 ) );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
// draw the 'muted' pixmap only if the pattern was manualy muted
if( m_tco->isMuted() )
// draw the 'muted' pixmap only if the clip was manualy muted
if( m_clip->isMuted() )
{
const int spacing = TCO_BORDER_WIDTH;
const int spacing = CLIP_BORDER_WIDTH;
const int size = 14;
p.drawPixmap( spacing, height() - ( size + spacing ),
embed::getIconPixmap( "muted", size, size ) );
@@ -291,7 +290,7 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
}
// recording sample tracks is not possible at the moment
/* if( m_tco->isRecord() )
/* if( m_clip->isRecord() )
{
p.setFont( pointSize<7>( p.font() ) );
@@ -312,9 +311,9 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
void SampleTCOView::reverseSample()
void SampleClipView::reverseSample()
{
m_tco->sampleBuffer()->setReversed(!m_tco->sampleBuffer()->reversed());
m_clip->sampleBuffer()->setReversed(!m_clip->sampleBuffer()->reversed());
Engine::getSong()->setModified();
update();
}
@@ -322,31 +321,31 @@ void SampleTCOView::reverseSample()
//! Split this TCO.
//! Split this Clip.
/*! \param pos the position of the split, relative to the start of the clip */
bool SampleTCOView::splitTCO( const TimePos pos )
bool SampleClipView::splitClip( const TimePos pos )
{
setMarkerEnabled( false );
const TimePos splitPos = m_initialTCOPos + pos;
const TimePos splitPos = m_initialClipPos + pos;
//Don't split if we slid off the TCO or if we're on the clip's start/end
//Don't split if we slid off the Clip or if we're on the clip's start/end
//Cutting at exactly the start/end position would create a zero length
//clip (bad), and a clip the same length as the original one (pointless).
if ( splitPos > m_initialTCOPos && splitPos < m_initialTCOEnd )
if ( splitPos > m_initialClipPos && splitPos < m_initialClipEnd )
{
m_tco->getTrack()->addJournalCheckPoint();
m_tco->getTrack()->saveJournallingState( false );
m_clip->getTrack()->addJournalCheckPoint();
m_clip->getTrack()->saveJournallingState( false );
SampleTCO * rightTCO = new SampleTCO ( *m_tco );
SampleClip * rightClip = new SampleClip ( *m_clip );
m_tco->changeLength( splitPos - m_initialTCOPos );
m_clip->changeLength( splitPos - m_initialClipPos );
rightTCO->movePosition( splitPos );
rightTCO->changeLength( m_initialTCOEnd - splitPos );
rightTCO->setStartTimeOffset( m_tco->startTimeOffset() - m_tco->length() );
rightClip->movePosition( splitPos );
rightClip->changeLength( m_initialClipEnd - splitPos );
rightClip->setStartTimeOffset( m_clip->startTimeOffset() - m_clip->length() );
m_tco->getTrack()->restoreJournallingState();
m_clip->getTrack()->restoreJournallingState();
return true;
}
else { return false; }

6
src/gui/SampleTrackView.cpp
View File

@@ -193,14 +193,14 @@ void SampleTrackView::dropEvent(QDropEvent *de)
? trackHeadWidth
: de->pos().x();
TimePos tcoPos = trackContainerView()->fixedTCOs()
TimePos clipPos = trackContainerView()->fixedClips()
? TimePos(0)
: TimePos(((xPos - trackHeadWidth) / trackContainerView()->pixelsPerBar()
* TimePos::ticksPerBar()) + trackContainerView()->currentPosition()
).quantize(1.0);
SampleTCO * sTco = static_cast<SampleTCO*>(getTrack()->createTCO(tcoPos));
if (sTco) { sTco->setSampleFile(value); }
SampleClip * sClip = static_cast<SampleClip*>(getTrack()->createClip(clipPos));
if (sClip) { sClip->setSampleFile(value); }
}
}

6
src/gui/TimeLineWidget.cpp
View File

@@ -330,7 +330,7 @@ void TimeLineWidget::mousePressEvent( QMouseEvent* event )
}
else if( event->button() == Qt::LeftButton && (event->modifiers() & Qt::ShiftModifier) )
{
m_action = SelectSongTCO;
m_action = SelectSongClip;
m_initalXSelect = event->x();
}
else if( event->button() == Qt::RightButton )
@@ -422,7 +422,7 @@ void TimeLineWidget::mouseMoveEvent( QMouseEvent* event )
update();
break;
}
case SelectSongTCO:
case SelectSongClip:
emit regionSelectedFromPixels( m_initalXSelect , event->x() );
break;
@@ -438,6 +438,6 @@ void TimeLineWidget::mouseReleaseEvent( QMouseEvent* event )
{
delete m_hint;
m_hint = nullptr;
if ( m_action == SelectSongTCO ) { emit selectionFinished(); }
if ( m_action == SelectSongClip ) { emit selectionFinished(); }
m_action = NoAction;
}

28
src/gui/TrackView.cpp
View File

@@ -44,7 +44,7 @@
#include "ToolTip.h"
#include "Track.h"
#include "TrackContainerView.h"
#include "TrackContentObjectView.h"
#include "ClipView.h"
/*! \brief Create a new track View.
@@ -89,8 +89,8 @@ TrackView::TrackView( Track * track, TrackContainerView * tcv ) :
connect( m_track, SIGNAL( destroyedTrack() ), this, SLOT( close() ) );
connect( m_track,
SIGNAL( trackContentObjectAdded( TrackContentObject * ) ),
this, SLOT( createTCOView( TrackContentObject * ) ),
SIGNAL( clipAdded( Clip * ) ),
this, SLOT( createClipView( Clip * ) ),
Qt::QueuedConnection );
connect( &m_track->m_mutedModel, SIGNAL( dataChanged() ),
@@ -102,12 +102,10 @@ TrackView::TrackView( Track * track, TrackContainerView * tcv ) :
connect( &m_track->m_soloModel, SIGNAL( dataChanged() ),
m_track, SLOT( toggleSolo() ), Qt::DirectConnection );
// create views for already existing TCOs
for( Track::tcoVector::iterator it =
m_track->m_trackContentObjects.begin();
it != m_track->m_trackContentObjects.end(); ++it )
// create views for already existing clips
for( Track::clipVector::iterator it = m_track->m_clips.begin(); it != m_track->m_clips.end(); ++it )
{
createTCOView( *it );
createClipView( *it );
}
m_trackContainerView->addTrackView( this );
@@ -155,7 +153,7 @@ void TrackView::resizeEvent( QResizeEvent * re )
void TrackView::update()
{
m_trackContentWidget.update();
if( !m_trackContainerView->fixedTCOs() )
if( !m_trackContainerView->fixedClips() )
{
m_trackContentWidget.changePosition();
}
@@ -418,19 +416,19 @@ void TrackView::paintEvent( QPaintEvent * pe )
/*! \brief Create a TrackContentObject View in this track View.
/*! \brief Create a Clip View in this track View.
*
* \param tco the TrackContentObject to create the view for.
* \param clip the Clip to create the view for.
* \todo is this a good description for what this method does?
*/
void TrackView::createTCOView( TrackContentObject * tco )
void TrackView::createClipView( Clip * clip )
{
TrackContentObjectView * tv = tco->createView( this );
if( tco->getSelectViewOnCreate() == true )
ClipView * tv = clip->createView( this );
if( clip->getSelectViewOnCreate() == true )
{
tv->setSelected( true );
}
tco->selectViewOnCreate( false );
clip->selectViewOnCreate( false );
}

264
src/gui/editors/AutomationEditor.cpp
View File

@@ -81,7 +81,7 @@ AutomationEditor::AutomationEditor() :
m_zoomingXModel(),
m_zoomingYModel(),
m_quantizeModel(),
m_pattern(nullptr),
m_clip(nullptr),
m_minLevel( 0 ),
m_maxLevel( 0 ),
m_step( 1 ),
@@ -109,8 +109,8 @@ AutomationEditor::AutomationEditor() :
m_crossColor(0, 0, 0),
m_backgroundShade(0, 0, 0)
{
connect( this, SIGNAL( currentPatternChanged() ),
this, SLOT( updateAfterPatternChange() ),
connect( this, SIGNAL( currentClipChanged() ),
this, SLOT( updateAfterClipChange() ),
Qt::QueuedConnection );
connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ),
this, SLOT( update() ) );
@@ -146,9 +146,9 @@ AutomationEditor::AutomationEditor() :
// add time-line
m_timeLine = new TimeLineWidget( VALUES_WIDTH, 0, m_ppb,
Engine::getSong()->getPlayPos(
Song::Mode_PlayAutomationPattern ),
Song::Mode_PlayAutomationClip ),
m_currentPosition,
Song::Mode_PlayAutomationPattern, this );
Song::Mode_PlayAutomationClip, this );
connect( this, SIGNAL( positionChanged( const TimePos & ) ),
m_timeLine, SLOT( updatePosition( const TimePos & ) ) );
connect( m_timeLine, SIGNAL( positionChanged( const TimePos & ) ),
@@ -184,7 +184,7 @@ AutomationEditor::AutomationEditor() :
s_toolMove = new QPixmap(embed::getIconPixmap("edit_move"));
}
setCurrentPattern(nullptr);
setCurrentClip(nullptr);
setMouseTracking( true );
setFocusPolicy( Qt::StrongFocus );
@@ -207,21 +207,21 @@ AutomationEditor::~AutomationEditor()
void AutomationEditor::setCurrentPattern(AutomationPattern * new_pattern )
void AutomationEditor::setCurrentClip(AutomationClip * new_clip )
{
if (m_pattern)
if (m_clip)
{
m_pattern->disconnect(this);
m_clip->disconnect(this);
}
m_pattern = new_pattern;
m_clip = new_clip;
if (m_pattern != nullptr)
if (m_clip != nullptr)
{
connect(m_pattern, SIGNAL(dataChanged()), this, SLOT(update()));
connect(m_clip, SIGNAL(dataChanged()), this, SLOT(update()));
}
emit currentPatternChanged();
emit currentClipChanged();
}
@@ -243,11 +243,11 @@ void AutomationEditor::loadSettings( const QDomElement & dom_parent)
void AutomationEditor::updateAfterPatternChange()
void AutomationEditor::updateAfterClipChange()
{
m_currentPosition = 0;
if( !validPattern() )
if( !validClip() )
{
m_minLevel = m_maxLevel = m_scrollLevel = 0;
m_step = 1;
@@ -255,12 +255,12 @@ void AutomationEditor::updateAfterPatternChange()
return;
}
m_minLevel = m_pattern->firstObject()->minValue<float>();
m_maxLevel = m_pattern->firstObject()->maxValue<float>();
m_step = m_pattern->firstObject()->step<float>();
m_minLevel = m_clip->firstObject()->minValue<float>();
m_maxLevel = m_clip->firstObject()->maxValue<float>();
m_step = m_clip->firstObject()->step<float>();
centerTopBottomScroll();
m_tensionModel->setValue( m_pattern->getTension() );
m_tensionModel->setValue( m_clip->getTension() );
// resizeEvent() does the rest for us (scrolling, range-checking
// of levels and so on...)
@@ -277,7 +277,7 @@ void AutomationEditor::update()
QWidget::update();
// Note detuning?
if( m_pattern && !m_pattern->getTrack() )
if( m_clip && !m_clip->getTrack() )
{
getGUI()->pianoRoll()->update();
}
@@ -344,8 +344,8 @@ void AutomationEditor::leaveEvent(QEvent * e )
void AutomationEditor::drawLine( int x0In, float y0, int x1In, float y1 )
{
int x0 = Note::quantized( x0In, AutomationPattern::quantization() );
int x1 = Note::quantized( x1In, AutomationPattern::quantization() );
int x0 = Note::quantized( x0In, AutomationClip::quantization() );
int x1 = Note::quantized( x1In, AutomationClip::quantization() );
int deltax = qAbs( x1 - x0 );
float deltay = qAbs<float>( y1 - y0 );
int x = x0;
@@ -353,22 +353,22 @@ void AutomationEditor::drawLine( int x0In, float y0, int x1In, float y1 )
int xstep;
int ystep;
if( deltax < AutomationPattern::quantization() )
if( deltax < AutomationClip::quantization() )
{
return;
}
deltax /= AutomationPattern::quantization();
deltax /= AutomationClip::quantization();
float yscale = deltay / ( deltax );
if( x0 < x1 )
{
xstep = AutomationPattern::quantization();
xstep = AutomationClip::quantization();
}
else
{
xstep = -( AutomationPattern::quantization() );
xstep = -( AutomationClip::quantization() );
}
float lineAdjust;
@@ -390,8 +390,8 @@ void AutomationEditor::drawLine( int x0In, float y0, int x1In, float y1 )
x += xstep;
i += 1;
m_pattern->removeNode(TimePos(x));
m_pattern->putValue( TimePos( x ), y );
m_clip->removeNode(TimePos(x));
m_clip->putValue( TimePos( x ), y );
}
}
@@ -400,7 +400,7 @@ void AutomationEditor::drawLine( int x0In, float y0, int x1In, float y1 )
bool AutomationEditor::fineTuneValue(timeMap::iterator node, bool editingOutValue)
{
if (node == m_pattern->getTimeMap().end()) { return false; }
if (node == m_clip->getTimeMap().end()) { return false; }
// Display dialog to edit the value
bool ok;
@@ -413,8 +413,8 @@ bool AutomationEditor::fineTuneValue(timeMap::iterator node, bool editingOutValu
editingOutValue
? OUTVAL(node)
: INVAL(node),
m_pattern->firstObject()->minValue<float>(),
m_pattern->firstObject()->maxValue<float>(),
m_clip->firstObject()->minValue<float>(),
m_clip->firstObject()->maxValue<float>(),
3,
&ok
);
@@ -447,7 +447,7 @@ bool AutomationEditor::fineTuneValue(timeMap::iterator node, bool editingOutValu
void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
{
if( !validPattern() )
if( !validClip() )
{
return;
}
@@ -455,15 +455,15 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
// Some helper lambda functions to avoid repetition of code
auto eraseNode = [this](timeMap::iterator node)
{
if (node != m_pattern->getTimeMap().end())
if (node != m_clip->getTimeMap().end())
{
m_pattern->removeNode(POS(node));
m_clip->removeNode(POS(node));
Engine::getSong()->setModified();
}
};
auto resetNode = [this](timeMap::iterator node)
{
if (node != m_pattern->getTimeMap().end())
if (node != m_clip->getTimeMap().end())
{
node.value().resetOutValue();
Engine::getSong()->setModified();
@@ -481,8 +481,8 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
// Get tick in which the user clicked
int posTicks = (x * TimePos::ticksPerBar() / m_ppb) + m_currentPosition;
// Get the time map of current pattern
timeMap & tm = m_pattern->getTimeMap();
// Get the time map of current clip
timeMap & tm = m_clip->getTimeMap();
m_mouseDownLeft = (mouseEvent->button() == Qt::LeftButton);
m_mouseDownRight = (mouseEvent->button() == Qt::RightButton);
@@ -501,7 +501,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
{
case DRAW:
{
m_pattern->addJournalCheckPoint();
m_clip->addJournalCheckPoint();
if (m_mouseDownLeft)
{
@@ -522,7 +522,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
else // No shift, we are just creating/moving nodes
{
// Starts actually moving/draging the node
TimePos newTime = m_pattern->setDragValue(
TimePos newTime = m_clip->setDragValue(
// The TimePos of either the clicked node or a new one
TimePos(
clickedNode == tm.end()
@@ -573,7 +573,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
}
case ERASE:
{
m_pattern->addJournalCheckPoint();
m_clip->addJournalCheckPoint();
// On erase mode, left click removes nodes
if (m_mouseDownLeft)
@@ -602,7 +602,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
}
case DRAW_OUTVALUES:
{
m_pattern->addJournalCheckPoint();
m_clip->addJournalCheckPoint();
// On this mode, left click sets the outValue
if (m_mouseDownLeft)
@@ -624,7 +624,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
// node and set its outValue
TimePos quantizedPos = Note::quantized(
TimePos(posTicks),
m_pattern->quantization()
m_clip->quantization()
);
clickedNode = tm.find(quantizedPos);
@@ -664,7 +664,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
void AutomationEditor::mouseDoubleClickEvent(QMouseEvent * mouseEvent)
{
if (!validPattern()) { return; }
if (!validClip()) { return; }
// If we double clicked outside the AutomationEditor viewport return
if (mouseEvent->y() <= TOP_MARGIN || mouseEvent->x() < VALUES_WIDTH) { return; }
@@ -707,7 +707,7 @@ void AutomationEditor::mouseReleaseEvent(QMouseEvent * mouseEvent )
if (m_action == MOVE_VALUE)
{
// Actually apply the value of the node being dragged
m_pattern->applyDragValue();
m_clip->applyDragValue();
}
QApplication::restoreOverrideCursor();
@@ -723,7 +723,7 @@ void AutomationEditor::mouseReleaseEvent(QMouseEvent * mouseEvent )
void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
{
if( !validPattern() )
if( !validClip() )
{
update();
return;
@@ -760,7 +760,7 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
m_drawLastLevel = level;
// Updates the drag value of the moved node
m_pattern->setDragValue(
m_clip->setDragValue(
TimePos(posTicks),
level,
true,
@@ -786,7 +786,7 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
// Removing automation nodes
// Removes all values from the last clicked tick up to the current position tick
m_pattern->removeNodes(m_drawLastTick, posTicks);
m_clip->removeNodes(m_drawLastTick, posTicks);
Engine::getSong()->setModified();
}
@@ -806,7 +806,7 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
// Removing automation nodes
// Removes all values from the last clicked tick up to the current position tick
m_pattern->removeNodes(m_drawLastTick, posTicks);
m_clip->removeNodes(m_drawLastTick, posTicks);
Engine::getSong()->setModified();
}
@@ -818,7 +818,7 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
// Reseting outValues
// Resets all values from the last clicked tick up to the current position tick
m_pattern->resetNodes(m_drawLastTick, posTicks);
m_clip->resetNodes(m_drawLastTick, posTicks);
Engine::getSong()->setModified();
}
@@ -836,7 +836,7 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
if (m_action == MOVE_OUTVALUE)
{
// We are moving the outValue of the node
timeMap & tm = m_pattern->getTimeMap();
timeMap & tm = m_clip->getTimeMap();
timeMap::iterator it = tm.find(m_draggedOutValueKey);
// Safety check
@@ -854,7 +854,7 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
// Reseting outValues
// Resets all values from the last clicked tick up to the current position tick
m_pattern->resetNodes(m_drawLastTick, posTicks);
m_clip->resetNodes(m_drawLastTick, posTicks);
Engine::getSong()->setModified();
}
@@ -894,7 +894,7 @@ inline void AutomationEditor::drawCross( QPainter & p )
tt_pos.ry() -= 51;
tt_pos.rx() += 26;
float scaledLevel = m_pattern->firstObject()->scaledValue( level );
float scaledLevel = m_clip->firstObject()->scaledValue( level );
// Limit the scaled-level tooltip to the grid
if( mouse_pos.x() >= 0 &&
@@ -913,12 +913,12 @@ inline void AutomationEditor::drawAutomationPoint(QPainter & p, timeMap::iterato
{
int x = xCoordOfTick(POS(it));
int y;
// Below (m_ppb * AutomationPattern::quantization() / 576) is used because:
// Below (m_ppb * AutomationClip::quantization() / 576) is used because:
// 1 bar equals to 192/quantization() notes. Hence, to calculate the number of pixels
// per note we would have (m_ppb * 1 bar / (192/quantization()) notes per bar), or
// (m_ppb * quantization / 192). If we want 1/3 of the number of pixels per note we
// get (m_ppb * quantization() / 192*3) or (m_ppb * quantization() / 576)
const int outerRadius = qBound(3, (m_ppb * AutomationPattern::quantization()) / 576, 5);
const int outerRadius = qBound(3, (m_ppb * AutomationClip::quantization()) / 576, 5);
// Draw a circle for the outValue
y = yCoordOfLevel(OUTVAL(it));
@@ -964,7 +964,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
Qt::Alignment text_flags =
(Qt::Alignment)( Qt::AlignRight | Qt::AlignVCenter );
if( validPattern() )
if( validClip() )
{
if( m_y_auto )
{
@@ -972,7 +972,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
float level[] = { m_minLevel, m_maxLevel };
for( int i = 0; i < 2; ++i )
{
const QString & label = m_pattern->firstObject()
const QString & label = m_clip->firstObject()
->displayValue( level[i] );
p.setPen( QApplication::palette().color( QPalette::Active,
QPalette::Shadow ) );
@@ -1000,7 +1000,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
}
for( ; level <= m_topLevel; level += printable )
{
const QString & label = m_pattern->firstObject()
const QString & label = m_clip->firstObject()
->displayValue( level );
y = yCoordOfLevel( level );
p.setPen( QApplication::palette().color( QPalette::Active,
@@ -1023,7 +1023,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
// draw vertical raster
if( m_pattern )
if( m_clip )
{
int tick, x, q;
int x_line_end = (int)( m_y_auto || m_topLevel < m_maxLevel ?
@@ -1033,17 +1033,17 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
if( m_zoomingXModel.value() > 3 )
{
// If we're over 100% zoom, we allow all quantization level grids
q = AutomationPattern::quantization();
q = AutomationClip::quantization();
}
else if( AutomationPattern::quantization() % 3 != 0 )
else if( AutomationClip::quantization() % 3 != 0 )
{
// If we're under 100% zoom, we allow quantization grid up to 1/24 for triplets
// to ensure a dense doesn't fill out the background
q = AutomationPattern::quantization() < 8 ? 8 : AutomationPattern::quantization();
q = AutomationClip::quantization() < 8 ? 8 : AutomationClip::quantization();
}
else {
// If we're under 100% zoom, we allow quantization grid up to 1/32 for normal notes
q = AutomationPattern::quantization() < 6 ? 6 : AutomationPattern::quantization();
q = AutomationClip::quantization() < 6 ? 6 : AutomationClip::quantization();
}
// 3 independent loops, because quantization might not divide evenly into
@@ -1136,11 +1136,11 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
// following code draws all visible values
if( validPattern() )
if( validClip() )
{
//NEEDS Change in CSS
//int len_ticks = 4;
timeMap & time_map = m_pattern->getTimeMap();
timeMap & time_map = m_clip->getTimeMap();
//Don't bother doing/rendering anything if there is no automation points
if( time_map.size() > 0 )
@@ -1163,7 +1163,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
break;
}
float *values = m_pattern->valuesAfter(POS(it));
float *values = m_clip->valuesAfter(POS(it));
// We are creating a path to draw a polygon representing the values between two
// nodes. When we have two nodes with discrete progression, we will basically have
@@ -1172,7 +1172,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
// the value of the end of the shape between the two nodes will be the inValue of
// the next node.
float nextValue;
if( m_pattern->progressionType() == AutomationPattern::DiscreteProgression )
if( m_clip->progressionType() == AutomationClip::DiscreteProgression )
{
nextValue = OUTVAL(it);
}
@@ -1225,12 +1225,12 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
p.drawText( VALUES_WIDTH + 20, TOP_MARGIN + 40,
width() - VALUES_WIDTH - 20 - SCROLLBAR_SIZE,
grid_height - 40, Qt::TextWordWrap,
tr( "Please open an automation pattern with "
tr( "Please open an automation clip with "
"the context menu of a control!" ) );
}
// TODO: Get this out of paint event
int l = validPattern() ? (int) m_pattern->length() : 0;
int l = validClip() ? (int) m_clip->length() : 0;
// reset scroll-range
if( m_leftRightScroll->maximum() != l )
@@ -1239,7 +1239,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
m_leftRightScroll->setPageStep( l );
}
if(validPattern() && GuiApplication::instance()->automationEditor()->m_editor->hasFocus())
if(validClip() && GuiApplication::instance()->automationEditor()->m_editor->hasFocus())
{
drawCross( p );
}
@@ -1351,17 +1351,17 @@ void AutomationEditor::centerTopBottomScroll()
{
// default to the m_scrollLevel position
int pos = static_cast<int>(m_scrollLevel);
// If a pattern exists...
if (m_pattern)
// If a clip exists...
if (m_clip)
{
// get time map of current pattern
timeMap & time_map = m_pattern->getTimeMap();
// get time map of current clip
timeMap & time_map = m_clip->getTimeMap();
// If time_map is not empty...
if (!time_map.empty())
{
// set the position to the inverted value ((max + min) - value)
// If we set just (max - value), we're off by m_pattern's minimum
pos = m_pattern->getMax() + m_pattern->getMin() - static_cast<int>(INVAL(time_map.begin()));
// If we set just (max - value), we're off by m_clip's minimum
pos = m_clip->getMax() + m_clip->getMin() - static_cast<int>(INVAL(time_map.begin()));
}
}
m_topBottomScroll->setValue(pos);
@@ -1400,7 +1400,7 @@ void AutomationEditor::resizeEvent(QResizeEvent * re)
if( Engine::getSong() )
{
Engine::getSong()->getPlayPos( Song::Mode_PlayAutomationPattern
Engine::getSong()->getPlayPos( Song::Mode_PlayAutomationClip
).m_timeLine->setFixedWidth( width() );
}
@@ -1510,8 +1510,8 @@ float AutomationEditor::getLevel(int y )
inline bool AutomationEditor::inBBEditor()
{
return( validPattern() &&
m_pattern->getTrack()->trackContainer() == Engine::getBBTrackContainer() );
return( validClip() &&
m_clip->getTrack()->trackContainer() == Engine::getBBTrackContainer() );
}
@@ -1519,17 +1519,17 @@ inline bool AutomationEditor::inBBEditor()
void AutomationEditor::play()
{
if( !validPattern() )
if( !validClip() )
{
return;
}
if( !m_pattern->getTrack() )
if( !m_clip->getTrack() )
{
if( Engine::getSong()->playMode() != Song::Mode_PlayPattern )
if( Engine::getSong()->playMode() != Song::Mode_PlayMidiClip )
{
Engine::getSong()->stop();
Engine::getSong()->playPattern( getGUI()->pianoRoll()->currentPattern() );
Engine::getSong()->playMidiClip( getGUI()->pianoRoll()->currentMidiClip() );
}
else if( Engine::getSong()->isStopped() == false )
{
@@ -1537,7 +1537,7 @@ void AutomationEditor::play()
}
else
{
Engine::getSong()->playPattern( getGUI()->pianoRoll()->currentPattern() );
Engine::getSong()->playMidiClip( getGUI()->pianoRoll()->currentMidiClip() );
}
}
else if( inBBEditor() )
@@ -1562,11 +1562,11 @@ void AutomationEditor::play()
void AutomationEditor::stop()
{
if( !validPattern() )
if( !validClip() )
{
return;
}
if( m_pattern->getTrack() && inBBEditor() )
if( m_clip->getTrack() && inBBEditor() )
{
Engine::getBBTrackContainer()->stop();
}
@@ -1621,12 +1621,12 @@ void AutomationEditor::setEditMode(int mode)
void AutomationEditor::setProgressionType(AutomationPattern::ProgressionTypes type)
void AutomationEditor::setProgressionType(AutomationClip::ProgressionTypes type)
{
if (validPattern())
if (validClip())
{
m_pattern->addJournalCheckPoint();
m_pattern->setProgressionType(type);
m_clip->addJournalCheckPoint();
m_clip->setProgressionType(type);
Engine::getSong()->setModified();
update();
}
@@ -1634,7 +1634,7 @@ void AutomationEditor::setProgressionType(AutomationPattern::ProgressionTypes ty
void AutomationEditor::setProgressionType(int type)
{
setProgressionType((AutomationPattern::ProgressionTypes) type);
setProgressionType((AutomationClip::ProgressionTypes) type);
}
@@ -1642,9 +1642,9 @@ void AutomationEditor::setProgressionType(int type)
void AutomationEditor::setTension()
{
if ( m_pattern )
if ( m_clip )
{
m_pattern->setTension( QString::number( m_tensionModel->value() ) );
m_clip->setTension( QString::number( m_tensionModel->value() ) );
update();
}
}
@@ -1656,7 +1656,7 @@ void AutomationEditor::updatePosition(const TimePos & t )
{
if( ( Engine::getSong()->isPlaying() &&
Engine::getSong()->playMode() ==
Song::Mode_PlayAutomationPattern ) ||
Song::Mode_PlayAutomationClip ) ||
m_scrollBack == true )
{
const int w = width() - VALUES_WIDTH;
@@ -1712,7 +1712,7 @@ void AutomationEditor::zoomingYChanged()
void AutomationEditor::setQuantization()
{
AutomationPattern::setQuantization(DefaultTicksPerBar / Quantizations[m_quantizeModel.value()]);
AutomationClip::setQuantization(DefaultTicksPerBar / Quantizations[m_quantizeModel.value()]);
update();
}
@@ -1786,8 +1786,8 @@ AutomationEditor::timeMap::iterator AutomationEditor::getNodeAt(int x, int y, bo
// Convert the x position to the position in ticks
int posTicks = (x * TimePos::ticksPerBar() / m_ppb) + m_currentPosition;
// Get our pattern timeMap and create a iterator so we can check the nodes
timeMap & tm = m_pattern->getTimeMap();
// Get our clip timeMap and create a iterator so we can check the nodes
timeMap & tm = m_clip->getTimeMap();
timeMap::iterator it = tm.begin();
// ticksOffset is the number of ticks that match "r" pixels
@@ -1832,9 +1832,9 @@ AutomationEditorWindow::AutomationEditorWindow() :
// Play/stop buttons
m_playAction->setToolTip(tr( "Play/pause current pattern (Space)" ));
m_playAction->setToolTip(tr( "Play/pause current clip (Space)" ));
m_stopAction->setToolTip(tr("Stop playing of current pattern (Space)"));
m_stopAction->setToolTip(tr("Stop playing of current clip (Space)"));
// Edit mode buttons
DropToolBar *editActionsToolBar = addDropToolBarToTop(tr("Edit actions"));
@@ -1972,62 +1972,62 @@ AutomationEditorWindow::~AutomationEditorWindow()
}
void AutomationEditorWindow::setCurrentPattern(AutomationPattern* pattern)
void AutomationEditorWindow::setCurrentClip(AutomationClip* clip)
{
// Disconnect our old pattern
if (currentPattern() != nullptr)
// Disconnect our old clip
if (currentClip() != nullptr)
{
m_editor->m_pattern->disconnect(this);
m_editor->m_clip->disconnect(this);
m_flipXAction->disconnect();
m_flipYAction->disconnect();
}
m_editor->setCurrentPattern(pattern);
m_editor->setCurrentClip(clip);
// Set our window's title
if (pattern == nullptr)
if (clip == nullptr)
{
setWindowTitle( tr( "Automation Editor - no pattern" ) );
setWindowTitle( tr( "Automation Editor - no clip" ) );
return;
}
setWindowTitle( tr( "Automation Editor - %1" ).arg( m_editor->m_pattern->name() ) );
setWindowTitle( tr( "Automation Editor - %1" ).arg( m_editor->m_clip->name() ) );
switch(m_editor->m_pattern->progressionType())
switch(m_editor->m_clip->progressionType())
{
case AutomationPattern::DiscreteProgression:
case AutomationClip::DiscreteProgression:
m_discreteAction->setChecked(true);
m_tensionKnob->setEnabled(false);
break;
case AutomationPattern::LinearProgression:
case AutomationClip::LinearProgression:
m_linearAction->setChecked(true);
m_tensionKnob->setEnabled(false);
break;
case AutomationPattern::CubicHermiteProgression:
case AutomationClip::CubicHermiteProgression:
m_cubicHermiteAction->setChecked(true);
m_tensionKnob->setEnabled(true);
break;
}
// Connect new pattern
if (pattern)
// Connect new clip
if (clip)
{
connect(pattern, SIGNAL(dataChanged()), this, SLOT(update()));
connect( pattern, SIGNAL( dataChanged() ), this, SLOT( updateWindowTitle() ) );
connect(pattern, SIGNAL(destroyed()), this, SLOT(clearCurrentPattern()));
connect(clip, SIGNAL(dataChanged()), this, SLOT(update()));
connect( clip, SIGNAL( dataChanged() ), this, SLOT( updateWindowTitle() ) );
connect(clip, SIGNAL(destroyed()), this, SLOT(clearCurrentClip()));
connect(m_flipXAction, SIGNAL(triggered()), pattern, SLOT(flipX()));
connect(m_flipYAction, SIGNAL(triggered()), pattern, SLOT(flipY()));
connect(m_flipXAction, SIGNAL(triggered()), clip, SLOT(flipX()));
connect(m_flipYAction, SIGNAL(triggered()), clip, SLOT(flipY()));
}
emit currentPatternChanged();
emit currentClipChanged();
}
const AutomationPattern* AutomationEditorWindow::currentPattern()
const AutomationClip* AutomationEditorWindow::currentClip()
{
return m_editor->currentPattern();
return m_editor->currentClip();
}
void AutomationEditorWindow::dropEvent( QDropEvent *_de )
@@ -2041,16 +2041,16 @@ void AutomationEditorWindow::dropEvent( QDropEvent *_de )
journallingObject( val.toInt() ) );
if (mod != nullptr)
{
bool added = m_editor->m_pattern->addObject( mod );
bool added = m_editor->m_clip->addObject( mod );
if ( !added )
{
TextFloat::displayMessage( mod->displayName(),
tr( "Model is already connected "
"to this pattern." ),
"to this clip." ),
embed::getIconPixmap( "automation" ),
2000 );
}
setCurrentPattern( m_editor->m_pattern );
setCurrentClip( m_editor->m_clip );
}
}
@@ -2059,15 +2059,15 @@ void AutomationEditorWindow::dropEvent( QDropEvent *_de )
void AutomationEditorWindow::dragEnterEvent( QDragEnterEvent *_dee )
{
if (! m_editor->validPattern() ) {
if (! m_editor->validClip() ) {
return;
}
StringPairDrag::processDragEnterEvent( _dee, "automatable_model" );
}
void AutomationEditorWindow::open(AutomationPattern* pattern)
void AutomationEditorWindow::open(AutomationClip* clip)
{
setCurrentPattern(pattern);
setCurrentClip(clip);
parentWidget()->show();
show();
setFocus();
@@ -2078,10 +2078,10 @@ QSize AutomationEditorWindow::sizeHint() const
return {INITIAL_WIDTH, INITIAL_HEIGHT};
}
void AutomationEditorWindow::clearCurrentPattern()
void AutomationEditorWindow::clearCurrentClip()
{
m_editor->m_pattern = nullptr;
setCurrentPattern(nullptr);
m_editor->m_clip = nullptr;
setCurrentClip(nullptr);
}
void AutomationEditorWindow::focusInEvent(QFocusEvent * event)
@@ -2102,11 +2102,11 @@ void AutomationEditorWindow::stop()
void AutomationEditorWindow::updateWindowTitle()
{
if (m_editor->m_pattern == nullptr)
if (m_editor->m_clip == nullptr)
{
setWindowTitle( tr( "Automation Editor - no pattern" ) );
setWindowTitle( tr( "Automation Editor - no clip" ) );
return;
}
setWindowTitle( tr( "Automation Editor - %1" ).arg( m_editor->m_pattern->name() ) );
setWindowTitle( tr( "Automation Editor - %1" ).arg( m_editor->m_clip->name() ) );
}

44
src/gui/editors/BBEditor.cpp
View File

@@ -37,7 +37,7 @@
#include "Song.h"
#include "StringPairDrag.h"
#include "Pattern.h"
#include "MidiClip.h"
@@ -59,12 +59,12 @@ BBEditor::BBEditor( BBTrackContainer* tc ) :
"compacttrackbuttons" ).toInt() )
{
setMinimumWidth( TRACK_OP_WIDTH_COMPACT + DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT
+ 2 * TCO_BORDER_WIDTH + 384 );
+ 2 * CLIP_BORDER_WIDTH + 384 );
}
else
{
setMinimumWidth( TRACK_OP_WIDTH + DEFAULT_SETTINGS_WIDGET_WIDTH
+ 2 * TCO_BORDER_WIDTH + 384 );
+ 2 * CLIP_BORDER_WIDTH + 384 );
}
@@ -88,8 +88,8 @@ BBEditor::BBEditor( BBTrackContainer* tc ) :
trackAndStepActionsToolBar->addAction(embed::getIconPixmap("add_bb_track"), tr("Add beat/bassline"),
Engine::getSong(), SLOT(addBBTrack()));
trackAndStepActionsToolBar->addAction(embed::getIconPixmap("clone_bb_track_pattern"), tr("Clone beat/bassline pattern"),
m_trackContainerView, SLOT(clonePattern()));
trackAndStepActionsToolBar->addAction(embed::getIconPixmap("clone_bb_track_clip"), tr("Clone beat/bassline clip"),
m_trackContainerView, SLOT(cloneClip()));
trackAndStepActionsToolBar->addAction(
embed::getIconPixmap("add_sample_track"),
tr("Add sample-track"), m_trackContainerView,
@@ -196,7 +196,7 @@ void BBTrackContainerView::removeSteps()
{
if( ( *it )->type() == Track::InstrumentTrack )
{
Pattern* p = static_cast<Pattern *>( ( *it )->getTCO( m_bbtc->currentBB() ) );
MidiClip* p = static_cast<MidiClip *>( ( *it )->getClip( m_bbtc->currentBB() ) );
p->removeSteps();
}
}
@@ -225,7 +225,7 @@ void BBTrackContainerView::removeBBView(int bb)
{
for( TrackView* view : trackViews() )
{
view->getTrackContentWidget()->removeTCOView( bb );
view->getTrackContentWidget()->removeClipView( bb );
}
}
@@ -254,24 +254,24 @@ void BBTrackContainerView::dropEvent(QDropEvent* de)
DataFile dataFile( value.toUtf8() );
Track * t = Track::create( dataFile.content().firstChild().toElement(), model() );
// Ensure BB TCOs exist
bool hasValidBBTCOs = false;
if (t->getTCOs().size() == m_bbtc->numOfBBs())
// Ensure BB Clips exist
bool hasValidBBClips = false;
if (t->getClips().size() == m_bbtc->numOfBBs())
{
hasValidBBTCOs = true;
for (int i = 0; i < t->getTCOs().size(); ++i)
hasValidBBClips = true;
for (int i = 0; i < t->getClips().size(); ++i)
{
if (t->getTCOs()[i]->startPosition() != TimePos(i, 0))
if (t->getClips()[i]->startPosition() != TimePos(i, 0))
{
hasValidBBTCOs = false;
hasValidBBClips = false;
break;
}
}
}
if (!hasValidBBTCOs)
if (!hasValidBBClips)
{
t->deleteTCOs();
t->createTCOsForBB(m_bbtc->numOfBBs() - 1);
t->deleteClips();
t->createClipsForBB(m_bbtc->numOfBBs() - 1);
}
m_bbtc->updateAfterTrackAdd();
@@ -304,7 +304,7 @@ void BBTrackContainerView::makeSteps( bool clone )
{
if( ( *it )->type() == Track::InstrumentTrack )
{
Pattern* p = static_cast<Pattern *>( ( *it )->getTCO( m_bbtc->currentBB() ) );
MidiClip* p = static_cast<MidiClip *>( ( *it )->getClip( m_bbtc->currentBB() ) );
if( clone )
{
p->cloneSteps();
@@ -316,9 +316,9 @@ void BBTrackContainerView::makeSteps( bool clone )
}
}
// Creates a clone of the current BB track with the same pattern, but no TCOs in the song editor
// Creates a clone of the current BB track with the same clip, but no Clips in the song editor
// TODO: Avoid repeated code from cloneTrack and clearTrack in TrackOperationsWidget somehow
void BBTrackContainerView::clonePattern()
void BBTrackContainerView::cloneClip()
{
// Get the current BBTrack id
BBTrackContainer *bbtc = static_cast<BBTrackContainer*>(model());
@@ -332,9 +332,9 @@ void BBTrackContainerView::clonePattern()
Track *newTrack = bbt->clone();
bbtc->setCurrentBB( static_cast<BBTrack *>( newTrack )->index() );
// Track still have the TCOs which is undesirable in this case, clear the track
// Track still have the clips which is undesirable in this case, clear the track
newTrack->lock();
newTrack->deleteTCOs();
newTrack->deleteClips();
newTrack->unlock();
}
}

516
src/gui/editors/PianoRoll.cpp
View File

File diff suppressed because it is too large Load Diff

28
src/gui/editors/SongEditor.cpp
View File

@@ -352,7 +352,7 @@ void SongEditor::selectRegionFromPixels(int xStart, int xEnd)
{
m_selectRegion = true;
//deselect all tcos
//deselect all clips
for (auto &it : findChildren<selectableObject *>()) { it->setSelected(false); }
rubberBand()->setEnabled(true);
@@ -419,17 +419,17 @@ void SongEditor::updateRubberband()
/ pixelsPerBar() * TimePos::ticksPerBar())
+ m_currentPosition;
//are tcos in the rect of selection?
//are clips in the rect of selection?
for (auto &it : findChildren<selectableObject *>())
{
TrackContentObjectView * tco = dynamic_cast<TrackContentObjectView*>(it);
if (tco)
ClipView * clip = dynamic_cast<ClipView*>(it);
if (clip)
{
auto indexOfTrackView = trackViews().indexOf(tco->getTrackView());
auto indexOfTrackView = trackViews().indexOf(clip->getTrackView());
bool isBeetweenRubberbandViews = indexOfTrackView >= qMin(m_rubberBandStartTrackview, rubberBandTrackview)
&& indexOfTrackView <= qMax(m_rubberBandStartTrackview, rubberBandTrackview);
bool isBeetweenRubberbandTimePos = tco->getTrackContentObject()->endPosition() >= qMin(m_rubberbandStartTimePos, rubberbandTimePos)
&& tco->getTrackContentObject()->startPosition() <= qMax(m_rubberbandStartTimePos, rubberbandTimePos);
bool isBeetweenRubberbandTimePos = clip->getClip()->endPosition() >= qMin(m_rubberbandStartTimePos, rubberbandTimePos)
&& clip->getClip()->startPosition() <= qMax(m_rubberbandStartTimePos, rubberbandTimePos);
it->setSelected(isBeetweenRubberbandViews && isBeetweenRubberbandTimePos);
}
}
@@ -506,18 +506,18 @@ void SongEditor::keyPressEvent( QKeyEvent * ke )
for( QVector<selectableObject *>::iterator it = so.begin();
it != so.end(); ++it )
{
TrackContentObjectView * tcov =
dynamic_cast<TrackContentObjectView *>( *it );
tcov->remove();
ClipView * clipv =
dynamic_cast<ClipView *>( *it );
clipv->remove();
}
}
else if( ke->key() == Qt::Key_A && ke->modifiers() & Qt::ControlModifier )
{
selectAllTcos( !isShiftPressed );
selectAllClips( !isShiftPressed );
}
else if( ke->key() == Qt::Key_Escape )
{
selectAllTcos( false );
selectAllClips( false );
}
else
{
@@ -559,7 +559,7 @@ void SongEditor::wheelEvent( QWheelEvent * we )
// update timeline
m_song->m_playPos[Song::Mode_PlaySong].m_timeLine->
setPixelsPerBar( pixelsPerBar() );
// and make sure, all TCO's are resized and relocated
// and make sure, all Clip's are resized and relocated
realignTracks();
}
@@ -845,7 +845,7 @@ void SongEditor::zoomingChanged()
}
void SongEditor::selectAllTcos( bool select )
void SongEditor::selectAllClips( bool select )
{
QVector<selectableObject *> so = select ? rubberBand()->selectableObjects() : rubberBand()->selectedObjects();
for( int i = 0; i < so.count(); ++i )

4
src/gui/widgets/EnvelopeAndLfoView.cpp
View File

@@ -305,7 +305,7 @@ void EnvelopeAndLfoView::mousePressEvent( QMouseEvent * _me )
void EnvelopeAndLfoView::dragEnterEvent( QDragEnterEvent * _dee )
{
StringPairDrag::processDragEnterEvent( _dee,
QString( "samplefile,tco_%1" ).arg(
QString( "samplefile,clip_%1" ).arg(
Track::SampleTrack ) );
}
@@ -325,7 +325,7 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
_de->accept();
update();
}
else if( type == QString( "tco_%1" ).arg( Track::SampleTrack ) )
else if( type == QString( "clip_%1" ).arg( Track::SampleTrack ) )
{
DataFile dataFile( value.toUtf8() );
m_params->m_userWave.setAudioFile( dataFile.content().

2
src/gui/widgets/PositionLine.cpp
View File

@@ -63,7 +63,7 @@ void PositionLine::paintEvent(QPaintEvent* pe)
if (m_hasTailGradient &&
Engine::getSong()->isPlaying() &&
(Engine::getSong()->playMode() == Song::Mode_PlaySong ||
Engine::getSong()->playMode() == Song::Mode_PlayPattern))
Engine::getSong()->playMode() == Song::Mode_PlayMidiClip))
{
c.setAlpha(60);
gradient.setColorAt(w, c);

216
src/gui/widgets/TrackContentWidget.cpp
View File

@@ -29,7 +29,7 @@
#include <QMenu>
#include <QPainter>
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "BBEditor.h"
#include "BBTrackContainer.h"
#include "Clipboard.h"
@@ -40,7 +40,7 @@
#include "SongEditor.h"
#include "StringPairDrag.h"
#include "TrackContainerView.h"
#include "TrackContentObjectView.h"
#include "ClipView.h"
#include "TrackView.h"
@@ -132,41 +132,41 @@ void TrackContentWidget::updateBackground()
/*! \brief Adds a trackContentObjectView to this widget.
/*! \brief Adds a ClipView to this widget.
*
* Adds a(nother) trackContentObjectView to our list of views. We also
* Adds a(nother) ClipView to our list of views. We also
* check that our position is up-to-date.
*
* \param tcov The trackContentObjectView to add.
* \param clipv The ClipView to add.
*/
void TrackContentWidget::addTCOView( TrackContentObjectView * tcov )
void TrackContentWidget::addClipView( ClipView * clipv )
{
TrackContentObject * tco = tcov->getTrackContentObject();
Clip * clip = clipv->getClip();
m_tcoViews.push_back( tcov );
m_clipViews.push_back( clipv );
tco->saveJournallingState( false );
clip->saveJournallingState( false );
changePosition();
tco->restoreJournallingState();
clip->restoreJournallingState();
}
/*! \brief Removes the given trackContentObjectView to this widget.
/*! \brief Removes the given ClipView from this widget.
*
* Removes the given trackContentObjectView from our list of views.
* Removes the given ClipView from our list of views.
*
* \param tcov The trackContentObjectView to add.
* \param clipv The ClipView to add.
*/
void TrackContentWidget::removeTCOView( TrackContentObjectView * tcov )
void TrackContentWidget::removeClipView( ClipView * clipv )
{
tcoViewVector::iterator it = std::find( m_tcoViews.begin(),
m_tcoViews.end(),
tcov );
if( it != m_tcoViews.end() )
clipViewVector::iterator it = std::find( m_clipViews.begin(),
m_clipViews.end(),
clipv );
if( it != m_clipViews.end() )
{
m_tcoViews.erase( it );
m_clipViews.erase( it );
Engine::getSong()->setModified();
}
}
@@ -174,13 +174,13 @@ void TrackContentWidget::removeTCOView( TrackContentObjectView * tcov )
/*! \brief Update ourselves by updating all the tCOViews attached.
/*! \brief Update ourselves by updating all the ClipViews attached.
*
*/
void TrackContentWidget::update()
{
for( tcoViewVector::iterator it = m_tcoViews.begin();
it != m_tcoViews.end(); ++it )
for( clipViewVector::iterator it = m_clipViews.begin();
it != m_clipViews.end(); ++it )
{
( *it )->setFixedHeight( height() - 1 );
( *it )->update();
@@ -204,11 +204,11 @@ void TrackContentWidget::changePosition( const TimePos & newPos )
const int curBB = Engine::getBBTrackContainer()->currentBB();
setUpdatesEnabled( false );
// first show TCO for current BB...
for( tcoViewVector::iterator it = m_tcoViews.begin();
it != m_tcoViews.end(); ++it )
// first show Clip for current BB...
for( clipViewVector::iterator it = m_clipViews.begin();
it != m_clipViews.end(); ++it )
{
if( ( *it )->getTrackContentObject()->
if( ( *it )->getClip()->
startPosition().getBar() == curBB )
{
( *it )->move( 0, ( *it )->y() );
@@ -221,10 +221,10 @@ void TrackContentWidget::changePosition( const TimePos & newPos )
}
}
// ...then hide others to avoid flickering
for( tcoViewVector::iterator it = m_tcoViews.begin();
it != m_tcoViews.end(); ++it )
for( clipViewVector::iterator it = m_clipViews.begin();
it != m_clipViews.end(); ++it )
{
if( ( *it )->getTrackContentObject()->
if( ( *it )->getClip()->
startPosition().getBar() != curBB )
{
( *it )->hide();
@@ -245,31 +245,31 @@ void TrackContentWidget::changePosition( const TimePos & newPos )
const float ppb = m_trackView->trackContainerView()->pixelsPerBar();
setUpdatesEnabled( false );
for( tcoViewVector::iterator it = m_tcoViews.begin();
it != m_tcoViews.end(); ++it )
for( clipViewVector::iterator it = m_clipViews.begin();
it != m_clipViews.end(); ++it )
{
TrackContentObjectView * tcov = *it;
TrackContentObject * tco = tcov->getTrackContentObject();
ClipView * clipv = *it;
Clip * clip = clipv->getClip();
tco->changeLength( tco->length() );
clip->changeLength( clip->length() );
const int ts = tco->startPosition();
const int te = tco->endPosition()-3;
const int ts = clip->startPosition();
const int te = clip->endPosition()-3;
if( ( ts >= begin && ts <= end ) ||
( te >= begin && te <= end ) ||
( ts <= begin && te >= end ) )
{
tcov->move( static_cast<int>( ( ts - begin ) * ppb /
clipv->move( static_cast<int>( ( ts - begin ) * ppb /
TimePos::ticksPerBar() ),
tcov->y() );
if( !tcov->isVisible() )
clipv->y() );
if( !clipv->isVisible() )
{
tcov->show();
clipv->show();
}
}
else
{
tcov->move( -tcov->width()-10, tcov->y() );
clipv->move( -clipv->width()-10, clipv->y() );
}
}
setUpdatesEnabled( true );
@@ -303,14 +303,14 @@ TimePos TrackContentWidget::getPosition( int mouseX )
*/
void TrackContentWidget::dragEnterEvent( QDragEnterEvent * dee )
{
TimePos tcoPos = getPosition( dee->pos().x() );
if( canPasteSelection( tcoPos, dee ) == false )
TimePos clipPos = getPosition( dee->pos().x() );
if( canPasteSelection( clipPos, dee ) == false )
{
dee->ignore();
}
else
{
StringPairDrag::processDragEnterEvent( dee, "tco_" +
StringPairDrag::processDragEnterEvent( dee, "clip_" +
QString::number( getTrack()->type() ) );
}
}
@@ -318,24 +318,24 @@ void TrackContentWidget::dragEnterEvent( QDragEnterEvent * dee )
/*! \brief Returns whether a selection of TCOs can be pasted into this
/*! \brief Returns whether a selection of Clips can be pasted into this
*
* \param tcoPos the position of the TCO slot being pasted on
* \param clipPos the position of the Clip slot being pasted on
* \param de the DropEvent generated
*/
bool TrackContentWidget::canPasteSelection( TimePos tcoPos, const QDropEvent* de )
bool TrackContentWidget::canPasteSelection( TimePos clipPos, const QDropEvent* de )
{
const QMimeData * mimeData = de->mimeData();
// If the source of the DropEvent is the current instance of LMMS we don't allow pasting in the same bar
// if it's another instance of LMMS we allow it
return de->source()
? canPasteSelection( tcoPos, mimeData )
: canPasteSelection( tcoPos, mimeData, true );
? canPasteSelection( clipPos, mimeData )
: canPasteSelection( clipPos, mimeData, true );
}
// Overloaded method to make it possible to call this method without a Drag&Drop event
bool TrackContentWidget::canPasteSelection( TimePos tcoPos, const QMimeData* md , bool allowSameBar )
bool TrackContentWidget::canPasteSelection( TimePos clipPos, const QMimeData* md , bool allowSameBar )
{
// For decodeKey() and decodeValue()
using namespace Clipboard;
@@ -345,20 +345,20 @@ bool TrackContentWidget::canPasteSelection( TimePos tcoPos, const QMimeData* md
QString value = decodeValue( md );
// We can only paste into tracks of the same type
if( type != ( "tco_" + QString::number( t->type() ) ) ||
m_trackView->trackContainerView()->fixedTCOs() == true )
if( type != ( "clip_" + QString::number( t->type() ) ) ||
m_trackView->trackContainerView()->fixedClips() == true )
{
return false;
}
// value contains XML needed to reconstruct TCOs and place them
// value contains XML needed to reconstruct Clips and place them
DataFile dataFile( value.toUtf8() );
// Extract the metadata and which TCO was grabbed
// Extract the metadata and which Clip was grabbed
QDomElement metadata = dataFile.content().firstChildElement( "copyMetadata" );
QDomAttr tcoPosAttr = metadata.attributeNode( "grabbedTCOPos" );
TimePos grabbedTCOPos = tcoPosAttr.value().toInt();
TimePos grabbedTCOBar = TimePos( grabbedTCOPos.getBar(), 0 );
QDomAttr clipPosAttr = metadata.attributeNode( "grabbedClipPos" );
TimePos grabbedClipPos = clipPosAttr.value().toInt();
TimePos grabbedClipBar = TimePos( grabbedClipPos.getBar(), 0 );
// Extract the track index that was originally clicked
QDomAttr tiAttr = metadata.attributeNode( "initialTrackIndex" );
@@ -371,20 +371,20 @@ bool TrackContentWidget::canPasteSelection( TimePos tcoPos, const QMimeData* md
// Don't paste if we're on the same bar and allowSameBar is false
auto sourceTrackContainerId = metadata.attributeNode( "trackContainerId" ).value().toUInt();
if( !allowSameBar && sourceTrackContainerId == t->trackContainer()->id() &&
tcoPos == grabbedTCOBar && currentTrackIndex == initialTrackIndex )
clipPos == grabbedClipBar && currentTrackIndex == initialTrackIndex )
{
return false;
}
// Extract the tco data
QDomElement tcoParent = dataFile.content().firstChildElement( "tcos" );
QDomNodeList tcoNodes = tcoParent.childNodes();
// Extract the clip data
QDomElement clipParent = dataFile.content().firstChildElement( "tcos" ); //TODO: rename "tcos" to "clips"
QDomNodeList clipNodes = clipParent.childNodes();
// Determine if all the TCOs will land on a valid track
for( int i = 0; i < tcoNodes.length(); i++ )
// Determine if all the Clips will land on a valid track
for( int i = 0; i < clipNodes.length(); i++ )
{
QDomElement tcoElement = tcoNodes.item( i ).toElement();
int trackIndex = tcoElement.attributeNode( "trackIndex" ).value().toInt();
QDomElement clipElement = clipNodes.item( i ).toElement();
int trackIndex = clipElement.attributeNode( "trackIndex" ).value().toInt();
int finalTrackIndex = trackIndex + currentTrackIndex - initialTrackIndex;
// Track must be in TrackContainer's tracks
@@ -394,7 +394,7 @@ bool TrackContentWidget::canPasteSelection( TimePos tcoPos, const QMimeData* md
}
// Track must be of the same type
auto startTrackType = tcoElement.attributeNode("trackType").value().toInt();
auto startTrackType = clipElement.attributeNode("trackType").value().toInt();
Track * endTrack = tracks.at( finalTrackIndex );
if( startTrackType != endTrack->type() )
{
@@ -405,32 +405,32 @@ bool TrackContentWidget::canPasteSelection( TimePos tcoPos, const QMimeData* md
return true;
}
/*! \brief Pastes a selection of TCOs onto the track
/*! \brief Pastes a selection of Clips onto the track
*
* \param tcoPos the position of the TCO slot being pasted on
* \param clipPos the position of the Clip slot being pasted on
* \param de the DropEvent generated
*/
bool TrackContentWidget::pasteSelection( TimePos tcoPos, QDropEvent * de )
bool TrackContentWidget::pasteSelection( TimePos clipPos, QDropEvent * de )
{
const QMimeData * mimeData = de->mimeData();
if( canPasteSelection( tcoPos, de ) == false )
if( canPasteSelection( clipPos, de ) == false )
{
return false;
}
// We set skipSafetyCheck to true because we already called canPasteSelection
return pasteSelection( tcoPos, mimeData, true );
return pasteSelection( clipPos, mimeData, true );
}
// Overloaded method so we can call it without a Drag&Drop event
bool TrackContentWidget::pasteSelection( TimePos tcoPos, const QMimeData * md, bool skipSafetyCheck )
bool TrackContentWidget::pasteSelection( TimePos clipPos, const QMimeData * md, bool skipSafetyCheck )
{
// For decodeKey() and decodeValue()
using namespace Clipboard;
// When canPasteSelection was already called before, skipSafetyCheck will skip this
if( !skipSafetyCheck && canPasteSelection( tcoPos, md ) == false )
if( !skipSafetyCheck && canPasteSelection( clipPos, md ) == false )
{
return false;
}
@@ -440,19 +440,19 @@ bool TrackContentWidget::pasteSelection( TimePos tcoPos, const QMimeData * md, b
getTrack()->addJournalCheckPoint();
// value contains XML needed to reconstruct TCOs and place them
// value contains XML needed to reconstruct Clips and place them
DataFile dataFile( value.toUtf8() );
// Extract the tco data
QDomElement tcoParent = dataFile.content().firstChildElement( "tcos" );
QDomNodeList tcoNodes = tcoParent.childNodes();
// Extract the clip data
QDomElement clipParent = dataFile.content().firstChildElement( "tcos" ); //TODO: rename "tcos" to "clips"
QDomNodeList clipNodes = clipParent.childNodes();
// Extract the track index that was originally clicked
QDomElement metadata = dataFile.content().firstChildElement( "copyMetadata" );
QDomAttr tiAttr = metadata.attributeNode( "initialTrackIndex" );
int initialTrackIndex = tiAttr.value().toInt();
QDomAttr tcoPosAttr = metadata.attributeNode( "grabbedTCOPos" );
TimePos grabbedTCOPos = tcoPosAttr.value().toInt();
QDomAttr clipPosAttr = metadata.attributeNode( "grabbedClipPos" );
TimePos grabbedClipPos = clipPosAttr.value().toInt();
// Snap the mouse position to the beginning of the dropped bar, in ticks
const TrackContainer::TrackList tracks = getTrack()->trackContainer()->tracks();
@@ -470,56 +470,56 @@ bool TrackContentWidget::pasteSelection( TimePos tcoPos, const QMimeData * md, b
}
// TODO -- Need to draw the hovericon either way, or ghost the TCOs
// TODO -- Need to draw the hovericon either way, or ghost the Clips
// onto their final position.
float snapSize = getGUI()->songEditor()->m_editor->getSnapSize();
// All patterns should be offset the same amount as the grabbed pattern
TimePos offset = TimePos(tcoPos - grabbedTCOPos);
// All clips should be offset the same amount as the grabbed clip
TimePos offset = TimePos(clipPos - grabbedClipPos);
// Users expect clips to "fall" backwards, so bias the offset
offset -= TimePos::ticksPerBar() * snapSize / 2;
// The offset is quantized (rather than the positions) to preserve fine adjustments
offset = offset.quantize(snapSize);
// Get the leftmost TCO and fix the offset if it reaches below bar 0
TimePos leftmostPos = grabbedTCOPos;
for(int i = 0; i < tcoNodes.length(); ++i)
// Get the leftmost Clip and fix the offset if it reaches below bar 0
TimePos leftmostPos = grabbedClipPos;
for(int i = 0; i < clipNodes.length(); ++i)
{
QDomElement outerTCOElement = tcoNodes.item(i).toElement();
QDomElement tcoElement = outerTCOElement.firstChildElement();
QDomElement outerClipElement = clipNodes.item(i).toElement();
QDomElement clipElement = outerClipElement.firstChildElement();
TimePos pos = tcoElement.attributeNode("pos").value().toInt();
TimePos pos = clipElement.attributeNode("pos").value().toInt();
if(pos < leftmostPos) { leftmostPos = pos; }
}
// Fix offset if it sets the left most TCO to a negative position
// Fix offset if it sets the left most Clip to a negative position
offset = std::max(offset.getTicks(), -leftmostPos.getTicks());
for( int i = 0; i<tcoNodes.length(); i++ )
for( int i = 0; i<clipNodes.length(); i++ )
{
QDomElement outerTCOElement = tcoNodes.item( i ).toElement();
QDomElement tcoElement = outerTCOElement.firstChildElement();
QDomElement outerClipElement = clipNodes.item( i ).toElement();
QDomElement clipElement = outerClipElement.firstChildElement();
int trackIndex = outerTCOElement.attributeNode( "trackIndex" ).value().toInt();
int trackIndex = outerClipElement.attributeNode( "trackIndex" ).value().toInt();
int finalTrackIndex = trackIndex + ( currentTrackIndex - initialTrackIndex );
Track * t = tracks.at( finalTrackIndex );
// The new position is the old position plus the offset.
TimePos pos = tcoElement.attributeNode( "pos" ).value().toInt() + offset;
TimePos pos = clipElement.attributeNode( "pos" ).value().toInt() + offset;
// If we land on ourselves, offset by one snap
TimePos shift = TimePos::ticksPerBar() * getGUI()->songEditor()->m_editor->getSnapSize();
if (offset == 0 && initialTrackIndex == currentTrackIndex) { pos += shift; }
TrackContentObject * tco = t->createTCO( pos );
tco->restoreState( tcoElement );
tco->movePosition(pos); // Because we restored the state, we need to move the TCO again.
Clip * clip = t->createClip( pos );
clip->restoreState( clipElement );
clip->movePosition(pos); // Because we restored the state, we need to move the Clip again.
if( wasSelection )
{
tco->selectViewOnCreate( true );
clip->selectViewOnCreate( true );
}
}
AutomationPattern::resolveAllIDs();
AutomationClip::resolveAllIDs();
return true;
}
@@ -531,8 +531,8 @@ bool TrackContentWidget::pasteSelection( TimePos tcoPos, const QMimeData * md, b
*/
void TrackContentWidget::dropEvent( QDropEvent * de )
{
TimePos tcoPos = TimePos( getPosition( de->pos().x() ) );
if( pasteSelection( tcoPos, de ) == true )
TimePos clipPos = TimePos( getPosition( de->pos().x() ) );
if( pasteSelection( clipPos, de ) == true )
{
de->accept();
}
@@ -548,7 +548,7 @@ void TrackContentWidget::dropEvent( QDropEvent * de )
void TrackContentWidget::mousePressEvent( QMouseEvent * me )
{
// Enable box select if control is held when clicking an empty space
// (If we had clicked a TCO it would have intercepted the mouse event)
// (If we had clicked a Clip it would have intercepted the mouse event)
if( me->modifiers() & Qt::ControlModifier ){
getGUI()->songEditor()->m_editor->setEditMode(SongEditor::EditMode::SelectMode);
}
@@ -562,9 +562,9 @@ void TrackContentWidget::mousePressEvent( QMouseEvent * me )
{
QWidget::mousePressEvent( me );
}
// For an unmodified click, create a new TCO
// For an unmodified click, create a new Clip
else if( me->button() == Qt::LeftButton &&
!m_trackView->trackContainerView()->fixedTCOs() )
!m_trackView->trackContainerView()->fixedClips() )
{
QVector<selectableObject*> so = m_trackView->trackContainerView()->rubberBand()->selectedObjects();
for( int i = 0; i < so.count(); ++i )
@@ -574,7 +574,7 @@ void TrackContentWidget::mousePressEvent( QMouseEvent * me )
getTrack()->addJournalCheckPoint();
const TimePos pos = getPosition( me->x() ).getBar() *
TimePos::ticksPerBar();
getTrack()->createTCO(pos);
getTrack()->createClip(pos);
}
}
@@ -658,7 +658,7 @@ void TrackContentWidget::contextMenuEvent( QContextMenuEvent * cme )
return;
}
// If we don't have TCO data in the clipboard there's no need to create this menu
// If we don't have Clip data in the clipboard there's no need to create this menu
// since "paste" is the only action at the moment.
if( ! hasFormat( MimeType::StringPair ) )
{
@@ -683,9 +683,9 @@ void TrackContentWidget::contextMenuAction( QContextMenuEvent * cme, ContextMenu
{
case Paste:
// Paste the selection on the TimePos of the context menu event
TimePos tcoPos = getPosition( cme->x() );
TimePos clipPos = getPosition( cme->x() );
pasteSelection( tcoPos, getMimeData() );
pasteSelection( clipPos, getMimeData() );
break;
}
}

22
src/gui/widgets/TrackOperationsWidget.cpp
View File

@@ -31,7 +31,7 @@
#include <QPushButton>
#include <QCheckBox>
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "AutomationTrackView.h"
#include "ColorChooser.h"
#include "ConfigManager.h"
@@ -246,13 +246,13 @@ void TrackOperationsWidget::cloneTrack()
}
/*! \brief Clear this track - clears all TCOs from the track */
/*! \brief Clear this track - clears all Clips from the track */
void TrackOperationsWidget::clearTrack()
{
Track * t = m_trackView->getTrack();
t->addJournalCheckPoint();
t->lock();
t->deleteTCOs();
t->deleteClips();
t->unlock();
}
@@ -300,13 +300,13 @@ void TrackOperationsWidget::randomizeTrackColor()
Engine::getSong()->setModified();
}
void TrackOperationsWidget::resetTCOColors()
void TrackOperationsWidget::resetClipColors()
{
auto track = m_trackView->getTrack();
track->addJournalCheckPoint();
for (auto tco: track->getTCOs())
for (auto clip: track->getClips())
{
tco->useCustomClipColor(false);
clip->useCustomClipColor(false);
}
Engine::getSong()->setModified();
}
@@ -319,7 +319,7 @@ void TrackOperationsWidget::resetTCOColors()
* For all track types, we have the Clone and Remove options.
* For instrument-tracks we also offer the MIDI-control-menu
* For automation tracks, extra options: turn on/off recording
* on all TCOs (same should be added for sample tracks when
* on all Clips (same should be added for sample tracks when
* sampletrack recording is implemented)
*/
void TrackOperationsWidget::updateMenu()
@@ -333,7 +333,7 @@ void TrackOperationsWidget::updateMenu()
tr( "Remove this track" ),
this, SLOT( removeTrack() ) );
if( ! m_trackView->trackContainerView()->fixedTCOs() )
if( ! m_trackView->trackContainerView()->fixedClips() )
{
toMenu->addAction( tr( "Clear this track" ), this, SLOT( clearTrack() ) );
}
@@ -361,7 +361,7 @@ void TrackOperationsWidget::updateMenu()
colorMenu->addAction(tr("Reset"), this, SLOT(resetTrackColor()));
colorMenu->addAction(tr("Pick random"), this, SLOT(randomizeTrackColor()));
colorMenu->addSeparator();
colorMenu->addAction(tr("Reset clip colors"), this, SLOT(resetTCOColors()));
colorMenu->addAction(tr("Reset clip colors"), this, SLOT(resetClipColors()));
}
@@ -370,9 +370,9 @@ void TrackOperationsWidget::toggleRecording( bool on )
AutomationTrackView * atv = dynamic_cast<AutomationTrackView *>( m_trackView );
if( atv )
{
for( TrackContentObject * tco : atv->getTrack()->getTCOs() )
for( Clip * clip : atv->getTrack()->getClips() )
{
AutomationPattern * ap = dynamic_cast<AutomationPattern *>( tco );
AutomationClip * ap = dynamic_cast<AutomationClip *>( clip );
if( ap ) { ap->setRecording( on ); }
}
atv->update();

8
src/tracks/AutomationTrack.cpp
View File

@@ -25,7 +25,7 @@
*/
#include "AutomationTrackView.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
AutomationTrack::AutomationTrack( TrackContainer* tc, bool _hidden ) :
@@ -35,7 +35,7 @@ AutomationTrack::AutomationTrack( TrackContainer* tc, bool _hidden ) :
}
bool AutomationTrack::play( const TimePos & time_start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num )
const f_cnt_t _frame_base, int _clip_num )
{
return false;
}
@@ -51,9 +51,9 @@ TrackView * AutomationTrack::createView( TrackContainerView* tcv )
TrackContentObject* AutomationTrack::createTCO(const TimePos & pos)
Clip* AutomationTrack::createClip(const TimePos & pos)
{
AutomationPattern* p = new AutomationPattern(this);
AutomationClip* p = new AutomationClip(this);
p->movePosition(pos);
return p;
}

32
src/tracks/BBTrack.cpp
View File

@@ -43,7 +43,7 @@ BBTrack::BBTrack( TrackContainer* tc ) :
s_infoMap[this] = bbNum;
setName( tr( "Beat/Bassline %1" ).arg( bbNum ) );
Engine::getBBTrackContainer()->createTCOsForBB( bbNum );
Engine::getBBTrackContainer()->createClipsForBB( bbNum );
Engine::getBBTrackContainer()->setCurrentBB( bbNum );
Engine::getBBTrackContainer()->updateComboBox();
@@ -82,31 +82,31 @@ BBTrack::~BBTrack()
// play _frames frames of given TCO within starting with _start
// play _frames frames of given Clip within starting with _start
bool BBTrack::play( const TimePos & _start, const fpp_t _frames,
const f_cnt_t _offset, int _tco_num )
const f_cnt_t _offset, int _clip_num )
{
if( isMuted() )
{
return false;
}
if( _tco_num >= 0 )
if( _clip_num >= 0 )
{
return Engine::getBBTrackContainer()->play( _start, _frames, _offset, s_infoMap[this] );
}
tcoVector tcos;
getTCOsInRange( tcos, _start, _start + static_cast<int>( _frames / Engine::framesPerTick() ) );
clipVector clips;
getClipsInRange( clips, _start, _start + static_cast<int>( _frames / Engine::framesPerTick() ) );
if( tcos.size() == 0 )
if( clips.size() == 0 )
{
return false;
}
TimePos lastPosition;
TimePos lastLen;
for( tcoVector::iterator it = tcos.begin(); it != tcos.end(); ++it )
for( clipVector::iterator it = clips.begin(); it != clips.end(); ++it )
{
if( !( *it )->isMuted() &&
( *it )->startPosition() >= lastPosition )
@@ -134,11 +134,11 @@ TrackView * BBTrack::createView( TrackContainerView* tcv )
TrackContentObject* BBTrack::createTCO(const TimePos & pos)
Clip* BBTrack::createClip(const TimePos & pos)
{
BBTCO* bbtco = new BBTCO(this);
bbtco->movePosition(pos);
return bbtco;
BBClip* bbclip = new BBClip(this);
bbclip->movePosition(pos);
return bbclip;
}
@@ -179,13 +179,13 @@ void BBTrack::loadTrackSpecificSettings( const QDomElement & _this )
const int dst = s_infoMap[this];
TrackContainer::TrackList tl =
Engine::getBBTrackContainer()->tracks();
// copy TCOs of all tracks from source BB (at bar "src") to destination
// TCOs (which are created if they do not exist yet)
// copy Clips of all tracks from source BB (at bar "src") to destination
// Clips (which are created if they do not exist yet)
for( TrackContainer::TrackList::iterator it = tl.begin();
it != tl.end(); ++it )
{
TrackContentObject::copyStateTo( ( *it )->getTCO( src ),
( *it )->getTCO( dst ) );
Clip::copyStateTo( ( *it )->getClip( src ),
( *it )->getClip( dst ) );
}
setName( tr( "Clone of %1" ).arg(
_this.parentNode().toElement().attribute( "name" ) ) );

2
src/tracks/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ set(LMMS_SRCS
tracks/AutomationTrack.cpp
tracks/BBTrack.cpp
tracks/InstrumentTrack.cpp
tracks/Pattern.cpp
tracks/MidiClip.cpp
tracks/SampleTrack.cpp
PARENT_SCOPE

54
src/tracks/InstrumentTrack.cpp
View File

@@ -24,7 +24,7 @@
#include "InstrumentTrack.h"
#include "AudioEngine.h"
#include "AutomationPattern.h"
#include "AutomationClip.h"
#include "BBTrack.h"
#include "ConfigManager.h"
#include "ControllerConnection.h"
@@ -33,8 +33,8 @@
#include "InstrumentTrackView.h"
#include "Instrument.h"
#include "MidiClient.h"
#include "MidiClip.h"
#include "MixHelpers.h"
#include "Pattern.h"
#include "Song.h"
@@ -214,7 +214,7 @@ InstrumentTrack::~InstrumentTrack()
void InstrumentTrack::processAudioBuffer( sampleFrame* buf, const fpp_t frames, NotePlayHandle* n )
{
// we must not play the sound if this InstrumentTrack is muted...
if( isMuted() || ( Engine::getSong()->playMode() != Song::Mode_PlayPattern &&
if( isMuted() || ( Engine::getSong()->playMode() != Song::Mode_PlayMidiClip &&
n && n->isBbTrackMuted() ) || ! m_instrument )
{
return;
@@ -679,7 +679,7 @@ void InstrumentTrack::removeMidiPortNode( DataFile & _dataFile )
bool InstrumentTrack::play( const TimePos & _start, const fpp_t _frames,
const f_cnt_t _offset, int _tco_num )
const f_cnt_t _offset, int _clip_num )
{
if( ! m_instrument || ! tryLock() )
{
@@ -687,20 +687,20 @@ bool InstrumentTrack::play( const TimePos & _start, const fpp_t _frames,
}
const float frames_per_tick = Engine::framesPerTick();
tcoVector tcos;
clipVector clips;
::BBTrack * bb_track = nullptr;
if( _tco_num >= 0 )
if( _clip_num >= 0 )
{
TrackContentObject * tco = getTCO( _tco_num );
tcos.push_back( tco );
Clip * clip = getClip( _clip_num );
clips.push_back( clip );
if (trackContainer() == (TrackContainer*)Engine::getBBTrackContainer())
{
bb_track = BBTrack::findBBTrack( _tco_num );
bb_track = BBTrack::findBBTrack( _clip_num );
}
}
else
{
getTCOsInRange( tcos, _start, _start + static_cast<int>(
getClipsInRange( clips, _start, _start + static_cast<int>(
_frames / frames_per_tick ) );
}
@@ -711,7 +711,7 @@ bool InstrumentTrack::play( const TimePos & _start, const fpp_t _frames,
( *it )->processTimePos( _start );
}
if ( tcos.size() == 0 )
if ( clips.size() == 0 )
{
unlock();
return false;
@@ -719,25 +719,25 @@ bool InstrumentTrack::play( const TimePos & _start, const fpp_t _frames,
bool played_a_note = false; // will be return variable
for( tcoVector::Iterator it = tcos.begin(); it != tcos.end(); ++it )
for( clipVector::Iterator it = clips.begin(); it != clips.end(); ++it )
{
Pattern* p = dynamic_cast<Pattern*>( *it );
// everything which is not a pattern won't be played
// A pattern playing in the Piano Roll window will always play
if(p == nullptr ||
(Engine::getSong()->playMode() != Song::Mode_PlayPattern
MidiClip* c = dynamic_cast<MidiClip*>( *it );
// everything which is not a MIDI clip won't be played
// A MIDI clip playing in the Piano Roll window will always play
if(c == nullptr ||
(Engine::getSong()->playMode() != Song::Mode_PlayMidiClip
&& (*it)->isMuted()))
{
continue;
}
TimePos cur_start = _start;
if( _tco_num < 0 )
if( _clip_num < 0 )
{
cur_start -= p->startPosition();
cur_start -= c->startPosition();
}
// get all notes from the given pattern...
const NoteVector & notes = p->notes();
// get all notes from the given clip...
const NoteVector & notes = c->notes();
// ...and set our index to zero
NoteVector::ConstIterator nit = notes.begin();
@@ -764,11 +764,11 @@ bool InstrumentTrack::play( const TimePos & _start, const fpp_t _frames,
NotePlayHandle* notePlayHandle = NotePlayHandleManager::acquire( this, _offset, note_frames, *cur_note );
notePlayHandle->setBBTrack( bb_track );
// are we playing global song?
if( _tco_num < 0 )
if( _clip_num < 0 )
{
// then set song-global offset of pattern in order to
// then set song-global offset of clip in order to
// properly perform the note detuning
notePlayHandle->setSongGlobalParentOffset( p->startPosition() );
notePlayHandle->setSongGlobalParentOffset( c->startPosition() );
}
Engine::audioEngine()->addPlayHandle( notePlayHandle );
@@ -783,9 +783,9 @@ bool InstrumentTrack::play( const TimePos & _start, const fpp_t _frames,
TrackContentObject* InstrumentTrack::createTCO(const TimePos & pos)
Clip* InstrumentTrack::createClip(const TimePos & pos)
{
Pattern* p = new Pattern(this);
MidiClip* p = new MidiClip(this);
p->movePosition(pos);
return p;
}
@@ -943,7 +943,7 @@ void InstrumentTrack::loadTrackSpecificSettings( const QDomElement & thisElement
// 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(AutomationClip::classNodeName() != node.nodeName() &&
ControllerConnection::classNodeName() != node.nodeName() &&
!node.toElement().hasAttribute( "id" ))
{

128
src/tracks/Pattern.cpp → src/tracks/MidiClip.cpp
View File

@@ -1,5 +1,5 @@
/*
* Pattern.cpp - implementation of class pattern which holds notes
* MidiClip.cpp - implementation of class MidiClip, which holds notes
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2007 Danny McRae <khjklujn/at/yahoo.com>
@@ -23,7 +23,7 @@
*
*/
#include "Pattern.h"
#include "MidiClip.h"
#include "BBTrackContainer.h"
#include "GuiApplication.h"
@@ -33,17 +33,17 @@
#include <limits>
QPixmap * PatternView::s_stepBtnOn0 = nullptr;
QPixmap * PatternView::s_stepBtnOn200 = nullptr;
QPixmap * PatternView::s_stepBtnOff = nullptr;
QPixmap * PatternView::s_stepBtnOffLight = nullptr;
QPixmap * MidiClipView::s_stepBtnOn0 = nullptr;
QPixmap * MidiClipView::s_stepBtnOn200 = nullptr;
QPixmap * MidiClipView::s_stepBtnOff = nullptr;
QPixmap * MidiClipView::s_stepBtnOffLight = nullptr;
Pattern::Pattern( InstrumentTrack * _instrument_track ) :
TrackContentObject( _instrument_track ),
MidiClip::MidiClip( InstrumentTrack * _instrument_track ) :
Clip( _instrument_track ),
m_instrumentTrack( _instrument_track ),
m_patternType( BeatPattern ),
m_clipType( BeatClip ),
m_steps( TimePos::stepsPerBar() )
{
if( _instrument_track->trackContainer()
@@ -58,10 +58,10 @@ Pattern::Pattern( InstrumentTrack * _instrument_track ) :
Pattern::Pattern( const Pattern& other ) :
TrackContentObject( other.m_instrumentTrack ),
MidiClip::MidiClip( const MidiClip& other ) :
Clip( other.m_instrumentTrack ),
m_instrumentTrack( other.m_instrumentTrack ),
m_patternType( other.m_patternType ),
m_clipType( other.m_clipType ),
m_steps( other.m_steps )
{
for( NoteVector::ConstIterator it = other.m_notes.begin(); it != other.m_notes.end(); ++it )
@@ -85,9 +85,9 @@ Pattern::Pattern( const Pattern& other ) :
}
Pattern::~Pattern()
MidiClip::~MidiClip()
{
emit destroyedPattern( this );
emit destroyedMidiClip( this );
for( NoteVector::Iterator it = m_notes.begin();
it != m_notes.end(); ++it )
@@ -101,7 +101,7 @@ Pattern::~Pattern()
void Pattern::resizeToFirstTrack()
void MidiClip::resizeToFirstTrack()
{
// Resize this track to be the same as existing tracks in the BB
const TrackContainer::TrackList & tracks =
@@ -112,10 +112,10 @@ void Pattern::resizeToFirstTrack()
{
if(tracks.at(trackID) != m_instrumentTrack)
{
unsigned int currentTCO = m_instrumentTrack->
getTCOs().indexOf(this);
m_steps = static_cast<Pattern *>
(tracks.at(trackID)->getTCO(currentTCO))
unsigned int currentClip = m_instrumentTrack->
getClips().indexOf(this);
m_steps = static_cast<MidiClip *>
(tracks.at(trackID)->getClip(currentClip))
->m_steps;
}
break;
@@ -126,7 +126,7 @@ void Pattern::resizeToFirstTrack()
void Pattern::init()
void MidiClip::init()
{
connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ),
this, SLOT( changeTimeSignature() ) );
@@ -139,11 +139,11 @@ void Pattern::init()
void Pattern::updateLength()
void MidiClip::updateLength()
{
if( m_patternType == BeatPattern )
if( m_clipType == BeatClip )
{
changeLength( beatPatternLength() );
changeLength( beatClipLength() );
updateBBTrack();
return;
}
@@ -167,7 +167,7 @@ void Pattern::updateLength()
TimePos Pattern::beatPatternLength() const
TimePos MidiClip::beatClipLength() const
{
tick_t max_length = TimePos::ticksPerBar();
@@ -193,7 +193,7 @@ TimePos Pattern::beatPatternLength() const
Note * Pattern::addNote( const Note & _new_note, const bool _quant_pos )
Note * MidiClip::addNote( const Note & _new_note, const bool _quant_pos )
{
Note * new_note = new Note( _new_note );
if( _quant_pos && getGUI()->pianoRoll() )
@@ -216,7 +216,7 @@ Note * Pattern::addNote( const Note & _new_note, const bool _quant_pos )
void Pattern::removeNote( Note * _note_to_del )
void MidiClip::removeNote( Note * _note_to_del )
{
instrumentTrack()->lock();
NoteVector::Iterator it = m_notes.begin();
@@ -241,7 +241,7 @@ void Pattern::removeNote( Note * _note_to_del )
// returns a pointer to the note at specified step, or NULL if note doesn't exist
Note * Pattern::noteAtStep( int _step )
Note * MidiClip::noteAtStep( int _step )
{
for( NoteVector::Iterator it = m_notes.begin(); it != m_notes.end();
++it )
@@ -257,7 +257,7 @@ Note * Pattern::noteAtStep( int _step )
void Pattern::rearrangeAllNotes()
void MidiClip::rearrangeAllNotes()
{
// sort notes by start time
std::sort(m_notes.begin(), m_notes.end(), Note::lessThan);
@@ -265,7 +265,7 @@ void Pattern::rearrangeAllNotes()
void Pattern::clearNotes()
void MidiClip::clearNotes()
{
instrumentTrack()->lock();
for( NoteVector::Iterator it = m_notes.begin(); it != m_notes.end();
@@ -283,7 +283,7 @@ void Pattern::clearNotes()
Note * Pattern::addStepNote( int step )
Note * MidiClip::addStepNote( int step )
{
return addNote( Note( TimePos( -DefaultTicksPerBar ),
TimePos::stepPosition( step ) ), false );
@@ -292,7 +292,7 @@ Note * Pattern::addStepNote( int step )
void Pattern::setStep( int step, bool enabled )
void MidiClip::setStep( int step, bool enabled )
{
if( enabled )
{
@@ -312,7 +312,7 @@ void Pattern::setStep( int step, bool enabled )
void Pattern::splitNotes(NoteVector notes, TimePos pos)
void MidiClip::splitNotes(NoteVector notes, TimePos pos)
{
if (notes.empty()) { return; }
@@ -346,47 +346,47 @@ void Pattern::splitNotes(NoteVector notes, TimePos pos)
void Pattern::setType( PatternTypes _new_pattern_type )
void MidiClip::setType( MidiClipTypes _new_clip_type )
{
if( _new_pattern_type == BeatPattern ||
_new_pattern_type == MelodyPattern )
if( _new_clip_type == BeatClip ||
_new_clip_type == MelodyClip )
{
m_patternType = _new_pattern_type;
m_clipType = _new_clip_type;
}
}
void Pattern::checkType()
void MidiClip::checkType()
{
NoteVector::Iterator it = m_notes.begin();
while( it != m_notes.end() )
{
if( ( *it )->length() > 0 )
{
setType( MelodyPattern );
setType( MelodyClip );
return;
}
++it;
}
setType( BeatPattern );
setType( BeatClip );
}
void Pattern::saveSettings( QDomDocument & _doc, QDomElement & _this )
void MidiClip::saveSettings( QDomDocument & _doc, QDomElement & _this )
{
_this.setAttribute( "type", m_patternType );
_this.setAttribute( "type", m_clipType );
_this.setAttribute( "name", name() );
if( usesCustomClipColor() )
{
_this.setAttribute( "color", color().name() );
}
// as the target of copied/dragged pattern is always an existing
// pattern, we must not store actual position, instead we store -1
// as the target of copied/dragged MIDI clip is always an existing
// MIDI clip, we must not store actual position, instead we store -1
// which tells loadSettings() not to mess around with position
if( _this.parentNode().nodeName() == "clipboard" ||
_this.parentNode().nodeName() == "dnddata" )
@@ -411,9 +411,9 @@ void Pattern::saveSettings( QDomDocument & _doc, QDomElement & _this )
void Pattern::loadSettings( const QDomElement & _this )
void MidiClip::loadSettings( const QDomElement & _this )
{
m_patternType = static_cast<PatternTypes>( _this.attribute( "type"
m_clipType = static_cast<MidiClipTypes>( _this.attribute( "type"
).toInt() );
setName( _this.attribute( "name" ) );
@@ -466,33 +466,33 @@ void Pattern::loadSettings( const QDomElement & _this )
Pattern * Pattern::previousPattern() const
MidiClip * MidiClip::previousMidiClip() const
{
return adjacentPatternByOffset(-1);
return adjacentMidiClipByOffset(-1);
}
Pattern * Pattern::nextPattern() const
MidiClip * MidiClip::nextMidiClip() const
{
return adjacentPatternByOffset(1);
return adjacentMidiClipByOffset(1);
}
Pattern * Pattern::adjacentPatternByOffset(int offset) const
MidiClip * MidiClip::adjacentMidiClipByOffset(int offset) const
{
QVector<TrackContentObject *> tcos = m_instrumentTrack->getTCOs();
int tcoNum = m_instrumentTrack->getTCONum(this);
return dynamic_cast<Pattern*>(tcos.value(tcoNum + offset, nullptr));
QVector<Clip *> clips = m_instrumentTrack->getClips();
int clipNum = m_instrumentTrack->getClipNum(this);
return dynamic_cast<MidiClip*>(clips.value(clipNum + offset, nullptr));
}
void Pattern::clear()
void MidiClip::clear()
{
addJournalCheckPoint();
clearNotes();
@@ -501,14 +501,14 @@ void Pattern::clear()
void Pattern::addSteps()
void MidiClip::addSteps()
{
m_steps += TimePos::stepsPerBar();
updateLength();
emit dataChanged();
}
void Pattern::cloneSteps()
void MidiClip::cloneSteps()
{
int oldLength = m_steps;
m_steps *= 2; // cloning doubles the track
@@ -532,7 +532,7 @@ void Pattern::cloneSteps()
void Pattern::removeSteps()
void MidiClip::removeSteps()
{
int n = TimePos::stepsPerBar();
if( n < m_steps )
@@ -550,15 +550,15 @@ void Pattern::removeSteps()
TrackContentObjectView * Pattern::createView( TrackView * _tv )
ClipView * MidiClip::createView( TrackView * _tv )
{
return new PatternView( this, _tv );
return new MidiClipView( this, _tv );
}
void Pattern::updateBBTrack()
void MidiClip::updateBBTrack()
{
if( getTrack()->trackContainer() == Engine::getBBTrackContainer() )
{
@@ -567,7 +567,7 @@ void Pattern::updateBBTrack()
if( getGUI() != nullptr
&& getGUI()->pianoRoll()
&& getGUI()->pianoRoll()->currentPattern() == this )
&& getGUI()->pianoRoll()->currentMidiClip() == this )
{
getGUI()->pianoRoll()->update();
}
@@ -576,7 +576,7 @@ void Pattern::updateBBTrack()
bool Pattern::empty()
bool MidiClip::empty()
{
for( NoteVector::ConstIterator it = m_notes.begin();
it != m_notes.end(); ++it )
@@ -592,7 +592,7 @@ bool Pattern::empty()
void Pattern::changeTimeSignature()
void MidiClip::changeTimeSignature()
{
TimePos last_pos = TimePos::ticksPerBar() - 1;
for( NoteVector::ConstIterator cit = m_notes.begin();
@@ -608,4 +608,4 @@ void Pattern::changeTimeSignature()
m_steps = qMax<tick_t>( TimePos::stepsPerBar(),
last_pos.getBar() * TimePos::stepsPerBar() );
updateLength();
}
}

74
src/tracks/SampleTrack.cpp
View File

@@ -61,16 +61,16 @@ SampleTrack::~SampleTrack()
bool SampleTrack::play( const TimePos & _start, const fpp_t _frames,
const f_cnt_t _offset, int _tco_num )
const f_cnt_t _offset, int _clip_num )
{
m_audioPort.effects()->startRunning();
bool played_a_note = false; // will be return variable
bool played_a_note = false; // will be return variable
tcoVector tcos;
clipVector clips;
::BBTrack * bb_track = nullptr;
if( _tco_num >= 0 )
if( _clip_num >= 0 )
{
if (_start > getTCO(_tco_num)->length())
if (_start > getClip(_clip_num)->length())
{
setPlaying(false);
}
@@ -78,55 +78,55 @@ bool SampleTrack::play( const TimePos & _start, const fpp_t _frames,
{
return false;
}
tcos.push_back( getTCO( _tco_num ) );
clips.push_back( getClip( _clip_num ) );
if (trackContainer() == (TrackContainer*)Engine::getBBTrackContainer())
{
bb_track = BBTrack::findBBTrack( _tco_num );
bb_track = BBTrack::findBBTrack( _clip_num );
setPlaying(true);
}
}
else
{
bool nowPlaying = false;
for( int i = 0; i < numOfTCOs(); ++i )
for( int i = 0; i < numOfClips(); ++i )
{
TrackContentObject * tco = getTCO( i );
SampleTCO * sTco = dynamic_cast<SampleTCO*>( tco );
Clip * clip = getClip( i );
SampleClip * sClip = dynamic_cast<SampleClip*>( clip );
if( _start >= sTco->startPosition() && _start < sTco->endPosition() )
if( _start >= sClip->startPosition() && _start < sClip->endPosition() )
{
if( sTco->isPlaying() == false && _start >= (sTco->startPosition() + sTco->startTimeOffset()) )
if( sClip->isPlaying() == false && _start >= (sClip->startPosition() + sClip->startTimeOffset()) )
{
auto bufferFramesPerTick = Engine::framesPerTick (sTco->sampleBuffer ()->sampleRate ());
f_cnt_t sampleStart = bufferFramesPerTick * ( _start - sTco->startPosition() - sTco->startTimeOffset() );
f_cnt_t tcoFrameLength = bufferFramesPerTick * ( sTco->endPosition() - sTco->startPosition() - sTco->startTimeOffset() );
f_cnt_t sampleBufferLength = sTco->sampleBuffer()->frames();
//if the Tco smaller than the sample length we play only until Tco end
auto bufferFramesPerTick = Engine::framesPerTick (sClip->sampleBuffer ()->sampleRate ());
f_cnt_t sampleStart = bufferFramesPerTick * ( _start - sClip->startPosition() - sClip->startTimeOffset() );
f_cnt_t clipFrameLength = bufferFramesPerTick * ( sClip->endPosition() - sClip->startPosition() - sClip->startTimeOffset() );
f_cnt_t sampleBufferLength = sClip->sampleBuffer()->frames();
//if the Clip smaller than the sample length we play only until Clip end
//else we play the sample to the end but nothing more
f_cnt_t samplePlayLength = tcoFrameLength > sampleBufferLength ? sampleBufferLength : tcoFrameLength;
f_cnt_t samplePlayLength = clipFrameLength > sampleBufferLength ? sampleBufferLength : clipFrameLength;
//we only play within the sampleBuffer limits
if( sampleStart < sampleBufferLength )
{
sTco->setSampleStartFrame( sampleStart );
sTco->setSamplePlayLength( samplePlayLength );
tcos.push_back( sTco );
sTco->setIsPlaying( true );
sClip->setSampleStartFrame( sampleStart );
sClip->setSamplePlayLength( samplePlayLength );
clips.push_back( sClip );
sClip->setIsPlaying( true );
nowPlaying = true;
}
}
}
else
{
sTco->setIsPlaying( false );
sClip->setIsPlaying( false );
}
nowPlaying = nowPlaying || sTco->isPlaying();
nowPlaying = nowPlaying || sClip->isPlaying();
}
setPlaying(nowPlaying);
}
for( tcoVector::Iterator it = tcos.begin(); it != tcos.end(); ++it )
for( clipVector::Iterator it = clips.begin(); it != clips.end(); ++it )
{
SampleTCO * st = dynamic_cast<SampleTCO *>( *it );
SampleClip * st = dynamic_cast<SampleClip *>( *it );
if( !st->isMuted() )
{
PlayHandle* handle;
@@ -167,11 +167,11 @@ TrackView * SampleTrack::createView( TrackContainerView* tcv )
TrackContentObject * SampleTrack::createTCO(const TimePos & pos)
Clip * SampleTrack::createClip(const TimePos & pos)
{
SampleTCO * sTco = new SampleTCO(this);
sTco->movePosition(pos);
return sTco;
SampleClip * sClip = new SampleClip(this);
sClip->movePosition(pos);
return sClip;
}
@@ -216,22 +216,22 @@ void SampleTrack::loadTrackSpecificSettings( const QDomElement & _this )
void SampleTrack::updateTcos()
void SampleTrack::updateClips()
{
Engine::audioEngine()->removePlayHandlesOfTypes( this, PlayHandle::TypeSamplePlayHandle );
setPlayingTcos( false );
setPlayingClips( false );
}
void SampleTrack::setPlayingTcos( bool isPlaying )
void SampleTrack::setPlayingClips( bool isPlaying )
{
for( int i = 0; i < numOfTCOs(); ++i )
for( int i = 0; i < numOfClips(); ++i )
{
TrackContentObject * tco = getTCO( i );
SampleTCO * sTco = dynamic_cast<SampleTCO*>( tco );
sTco->setIsPlaying( isPlaying );
Clip * clip = getClip( i );
SampleClip * sClip = dynamic_cast<SampleClip*>( clip );
sClip->setIsPlaying( isPlaying );
}
}