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

Rename bb_track_container to BBTrackContainer

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
include/bb_track_container.h → include/BBTrackContainer.h
View File

@@ -1,5 +1,5 @@
/*
* bb_track_container.h - model-component of BB-Editor
* BBTrackContainer.h - model-component of BB-Editor
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -30,13 +30,13 @@
#include "combobox.h"
class EXPORT bbTrackContainer : public TrackContainer
class EXPORT BBTrackContainer : public TrackContainer
{
Q_OBJECT
mapPropertyFromModel(int,currentBB,setCurrentBB,m_bbComboBoxModel);
public:
bbTrackContainer();
virtual ~bbTrackContainer();
BBTrackContainer();
virtual ~BBTrackContainer();
virtual bool play( MidiTime _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );

6
include/bb_editor.h
View File

@@ -29,7 +29,7 @@
#include "TrackContainerView.h"
class bbTrackContainer;
class BBTrackContainer;
class comboBox;
class toolButton;
@@ -38,7 +38,7 @@ class bbEditor : public TrackContainerView
{
Q_OBJECT
public:
bbEditor( bbTrackContainer * _tc );
bbEditor( BBTrackContainer * _tc );
virtual ~bbEditor();
virtual inline bool fixedTCOs() const
@@ -64,7 +64,7 @@ public slots:
private:
virtual void keyPressEvent( QKeyEvent * _ke );
bbTrackContainer * m_bbtc;
BBTrackContainer * m_bbtc;
QWidget * m_toolBar;
toolButton * m_playButton;

6
include/engine.h
View File

@@ -35,7 +35,7 @@
class AutomationEditor;
class bbEditor;
class bbTrackContainer;
class BBTrackContainer;
class DummyTrackContainer;
class FxMixer;
class FxMixerView;
@@ -87,7 +87,7 @@ public:
return s_song;
}
static bbTrackContainer * getBBTrackContainer()
static BBTrackContainer * getBBTrackContainer()
{
return s_bbTrackContainer;
}
@@ -179,7 +179,7 @@ private:
static Mixer *s_mixer;
static FxMixer * s_fxMixer;
static Song * s_song;
static bbTrackContainer * s_bbTrackContainer;
static BBTrackContainer * s_bbTrackContainer;
static ProjectJournal * s_projectJournal;
static DummyTrackContainer * s_dummyTC;
static ControllerRackView * s_controllerRackView;

2
plugins/HydrogenImport/HydrogenImport.cpp
View File

@@ -16,7 +16,7 @@
#include "Pattern.h"
#include "Track.h"
#include "bb_track.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "Instrument.h"
#define MAX_LAYERS 4

2
plugins/flp_import/FlpImport.cpp
View File

@@ -34,7 +34,7 @@
#include "AutomationPattern.h"
#include "basic_filters.h"
#include "bb_track.h"
#include "bb_track_container.h"
#include "BBTrackContainer.h"
#include "combobox.h"
#include "ConfigManager.h"
#include "debug.h"

81
qt.cfg Normal file
View File

@@ -0,0 +1,81 @@
<?xml version="1.0"?>
<def>
<markup ext=".qml" reporterrors="false" aftercode="true">
<!-- keywords in QML code to ignore -->
<keywords>
<keyword name="if"/>
<keyword name="while"/>
<keyword name="typeof"/>
<keyword name="for"/>
</keywords>
<!-- code blocks are meta-code/pseudo code placed in the library
that is used/called by the native c/c++ code -->
<codeblocks>
<!-- need to add all the QML function names below -->
<block name="onClicked"/>
<block name="onFinished"/>
<block name="onTriggered"/>
<block name="onRetrieveTriggered"/>
<block name="onPressed"/>
<block name="onTouch"/>
<block name="onFocusedChanged"/>
<block name="onSubmittedNewStatusChanged"/>
<block name="onCreationCompleted"/>
<block name="onFileSelected"/>
<!-- code block structure in QML is:
onClicked: {
call(var)
} -->
<structure offset="3" start="{" end="}"/>
<!-- the start block is '3' tokens after the
name token so we skip them -->
</codeblocks>
<codeblocks>
<block name="function"/>
<!-- code block structure in QML is:
funnction x(args): {
call(var)
} -->
<structure offset="2" start="{" end="}"/>
</codeblocks>
<!-- Qt Properties have the format :
Q_PROPERTY(<type> <name> READ <func> WRITE <func> NOTIFY <func>)
the READ/WRITE/NOTIFY parts are optional -->
<exported>
<exporter prefix="Q_PROPERTY">
<suffix>READ</suffix> <!-- catch the element before READ if present -->
<prefix>READ</prefix>
<prefix>WRITE</prefix>
<prefix>NOTIFY</prefix>
</exporter>
</exported>
<!-- qml files can call connect on the c++ code -->
<imported>
<importer>connect</importer>
</imported>
</markup>
<!-- qt can call methods as strings using invokeMethod -->
<reflection>
<call arg="2">invokeMethod</call>
</reflection>
<!-- the SLOT/SIGNAL methods can be cause false-positives for pure
virtual functions being called in the constructor because it sees
the macro as a function. -->
<function name="SLOT">
<ignorefunction>true</ignorefunction>
</function>
<function name="SIGNAL">
<ignorefunction>true</ignorefunction>
</function>
<define name="Q_DECL_EXPORT" value=""/>
<define name="Q_DECL_IMPORT" value=""/>
</def>

2
src/core/AutomationPattern.cpp
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"

34
src/core/bb_track_container.cpp → src/core/BBTrackContainer.cpp
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() )
{

2
src/core/FxMixer.cpp
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 ) :

2
src/core/Song.cpp
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"

2
src/core/Track.cpp
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"

6
src/core/engine.cpp
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;

2
src/gui/AutomationEditor.cpp
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"

2
src/gui/FileBrowser.cpp
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"

2
src/gui/FxMixerView.cpp
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(),

2
src/gui/PianoRoll.cpp
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"

4
src/gui/bb_editor.cpp
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 )
{

2
src/gui/export_project_dialog.cpp
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"

2
src/tracks/Pattern.cpp
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"

2
src/tracks/bb_track.cpp
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"