Rename bb_track_container to BBTrackContainer

This commit is contained in:
Lukas W
2014-11-26 00:46:49 +01:00
parent 7d0e3945e5
commit c2360f593c
20 changed files with 126 additions and 45 deletions

View File

@@ -33,7 +33,7 @@
#include "AutomationEditor.h"
#include "AutomationTrack.h"
#include "ProjectJournal.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "Song.h"
#include "text_float.h"
#include "embed.h"

View File

@@ -1,5 +1,5 @@
/*
* bb_track_container.cpp - model-component of BB-Editor
* BBTrackContainer.cpp - model-component of BB-Editor
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -23,7 +23,7 @@
*/
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "bb_track.h"
#include "combobox.h"
#include "embed.h"
@@ -32,7 +32,7 @@
bbTrackContainer::bbTrackContainer() :
BBTrackContainer::BBTrackContainer() :
TrackContainer(),
m_bbComboBoxModel( this )
{
@@ -47,14 +47,14 @@ bbTrackContainer::bbTrackContainer() :
bbTrackContainer::~bbTrackContainer()
BBTrackContainer::~BBTrackContainer()
{
}
bool bbTrackContainer::play( MidiTime _start, fpp_t _frames,
bool BBTrackContainer::play( MidiTime _start, fpp_t _frames,
f_cnt_t _offset, int _tco_num )
{
bool played_a_note = false;
@@ -80,7 +80,7 @@ bool bbTrackContainer::play( MidiTime _start, fpp_t _frames,
void bbTrackContainer::updateAfterTrackAdd()
void BBTrackContainer::updateAfterTrackAdd()
{
if( numOfBBs() == 0 && !engine::getSong()->isLoadingProject() )
{
@@ -97,7 +97,7 @@ void bbTrackContainer::updateAfterTrackAdd()
tact_t bbTrackContainer::lengthOfBB( int _bb )
tact_t BBTrackContainer::lengthOfBB( int _bb )
{
MidiTime max_length = MidiTime::ticksPerTact();
@@ -114,7 +114,7 @@ tact_t bbTrackContainer::lengthOfBB( int _bb )
int bbTrackContainer::numOfBBs() const
int BBTrackContainer::numOfBBs() const
{
return engine::getSong()->countTracks( Track::BBTrack );
}
@@ -122,7 +122,7 @@ int bbTrackContainer::numOfBBs() const
void bbTrackContainer::removeBB( int _bb )
void BBTrackContainer::removeBB( int _bb )
{
TrackList tl = tracks();
for( TrackList::iterator it = tl.begin(); it != tl.end(); ++it )
@@ -139,7 +139,7 @@ void bbTrackContainer::removeBB( int _bb )
void bbTrackContainer::swapBB( int _bb1, int _bb2 )
void BBTrackContainer::swapBB( int _bb1, int _bb2 )
{
TrackList tl = tracks();
for( TrackList::iterator it = tl.begin(); it != tl.end(); ++it )
@@ -152,7 +152,7 @@ void bbTrackContainer::swapBB( int _bb1, int _bb2 )
void bbTrackContainer::updateBBTrack( trackContentObject * _tco )
void BBTrackContainer::updateBBTrack( trackContentObject * _tco )
{
bbTrack * t = bbTrack::findBBTrack( _tco->startPosition() /
DefaultTicksPerTact );
@@ -165,7 +165,7 @@ void bbTrackContainer::updateBBTrack( trackContentObject * _tco )
void bbTrackContainer::fixIncorrectPositions()
void BBTrackContainer::fixIncorrectPositions()
{
TrackList tl = tracks();
for( TrackList::iterator it = tl.begin(); it != tl.end(); ++it )
@@ -180,7 +180,7 @@ void bbTrackContainer::fixIncorrectPositions()
void bbTrackContainer::play()
void BBTrackContainer::play()
{
if( engine::getSong()->playMode() != Song::Mode_PlayBB )
{
@@ -195,7 +195,7 @@ void bbTrackContainer::play()
void bbTrackContainer::stop()
void BBTrackContainer::stop()
{
engine::getSong()->stop();
}
@@ -203,7 +203,7 @@ void bbTrackContainer::stop()
void bbTrackContainer::updateComboBox()
void BBTrackContainer::updateComboBox()
{
const int cur_bb = currentBB();
@@ -220,7 +220,7 @@ void bbTrackContainer::updateComboBox()
void bbTrackContainer::currentBBChanged()
void BBTrackContainer::currentBBChanged()
{
// first make sure, all channels have a TCO at current BB
createTCOsForBB( currentBB() );
@@ -240,7 +240,7 @@ void bbTrackContainer::currentBBChanged()
void bbTrackContainer::createTCOsForBB( int _bb )
void BBTrackContainer::createTCOsForBB( int _bb )
{
if( numOfBBs() == 0 || engine::getSong()->isLoadingProject() )
{

View File

@@ -31,7 +31,7 @@
#include "Song.h"
#include "InstrumentTrack.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "ValueBuffer.h"
FxRoute::FxRoute( FxChannel * from, FxChannel * to, float amount ) :

View File

@@ -35,7 +35,7 @@
#include "AutomationEditor.h"
#include "bb_editor.h"
#include "bb_track.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "ConfigManager.h"
#include "ControllerRackView.h"
#include "ControllerConnection.h"

View File

@@ -51,7 +51,7 @@
#include "AutomationTrack.h"
#include "bb_editor.h"
#include "bb_track.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "ConfigManager.h"
#include "Clipboard.h"
#include "embed.h"

View File

@@ -26,7 +26,7 @@
#include "engine.h"
#include "AutomationEditor.h"
#include "bb_editor.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "ConfigManager.h"
#include "ControllerRackView.h"
#include "FxMixer.h"
@@ -53,7 +53,7 @@ Mixer* engine::s_mixer = NULL;
FxMixer * engine::s_fxMixer = NULL;
FxMixerView * engine::s_fxMixerView = NULL;
MainWindow * engine::s_mainWindow = NULL;
bbTrackContainer * engine::s_bbTrackContainer = NULL;
BBTrackContainer * engine::s_bbTrackContainer = NULL;
Song * engine::s_song = NULL;
SongEditor* engine::s_songEditor = NULL;
AutomationEditor * engine::s_automationEditor = NULL;
@@ -82,7 +82,7 @@ void engine::init( const bool _has_gui )
s_mixer = new Mixer;
s_song = new Song;
s_fxMixer = new FxMixer;
s_bbTrackContainer = new bbTrackContainer;
s_bbTrackContainer = new BBTrackContainer;
s_ladspaManager = new ladspa2LMMS;

View File

@@ -59,7 +59,7 @@
#include "tool_button.h"
#include "text_float.h"
#include "combobox.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "PianoRoll.h"
#include "debug.h"
#include "MeterModel.h"

View File

@@ -33,7 +33,7 @@
#include <QMdiSubWindow>
#include "FileBrowser.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "ConfigManager.h"
#include "debug.h"
#include "embed.h"

View File

@@ -45,7 +45,7 @@
#include "gui_templates.h"
#include "InstrumentTrack.h"
#include "Song.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
FxMixerView::FxMixerView() :
QWidget(),

View File

@@ -47,7 +47,7 @@
#include "ConfigManager.h"
#include "PianoRoll.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "Clipboard.h"
#include "combobox.h"
#include "debug.h"

View File

@@ -29,7 +29,7 @@
#include <QMdiArea>
#include "bb_editor.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "embed.h"
#include "MainWindow.h"
#include "Song.h"
@@ -43,7 +43,7 @@
bbEditor::bbEditor( bbTrackContainer* tc ) :
bbEditor::bbEditor( BBTrackContainer* tc ) :
TrackContainerView( tc ),
m_bbtc( tc )
{

View File

@@ -30,7 +30,7 @@
#include "Song.h"
#include "engine.h"
#include "MainWindow.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "bb_track.h"

View File

@@ -46,7 +46,7 @@
#include "AudioSampleRecorder.h"
#include "Song.h"
#include "tooltip.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "string_pair_drag.h"
#include "MainWindow.h"

View File

@@ -29,7 +29,7 @@
#include "bb_editor.h"
#include "bb_track.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "embed.h"
#include "engine.h"
#include "gui_templates.h"