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

TrackContainer, TrackContainerView: adopted coding style

Browse Source 
Renamed file and class names.
This commit is contained in:
Tobias Doerffel
2014-01-14 17:39:02 +01:00
parent 7105c8ac90
commit 4e5507a30a
38 changed files with 278 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/HydrogenImport/HydrogenImport.cpp
View File

@@ -378,7 +378,7 @@ bool HydrogenImport::readSong()
}
return true;
}
bool HydrogenImport::tryImport( trackContainer * _tc )
bool HydrogenImport::tryImport( TrackContainer* tc )
{
if( openFile() == false )
{

2
plugins/HydrogenImport/HydrogenImport.h
View File

@@ -21,7 +21,7 @@ public:
return( NULL );
}
private:
virtual bool tryImport( trackContainer * _tc );
virtual bool tryImport( TrackContainer* tc );
};
#endif

12
plugins/flp_import/FlpImport.cpp
View File

@@ -1,7 +1,7 @@
/*
* flp_import.cpp - support for importing FLP-files
*
* Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -51,7 +51,7 @@
#include "ProjectJournal.h"
#include "project_notes.h"
#include "song.h"
#include "track_container.h"
#include "TrackContainer.h"
#include "embed.h"
#include "lmmsconfig.h"
@@ -586,7 +586,7 @@ FlpImport::~FlpImport()
bool FlpImport::tryImport( trackContainer * _tc )
bool FlpImport::tryImport( TrackContainer* tc )
{
const int mappedFilter[] =
{
@@ -711,9 +711,9 @@ bool FlpImport::tryImport( trackContainer * _tc )
}
QProgressDialog progressDialog(
trackContainer::tr( "Importing FLP-file..." ),
trackContainer::tr( "Cancel" ), 0, p.numChannels );
progressDialog.setWindowTitle( trackContainer::tr( "Please wait..." ) );
TrackContainer::tr( "Importing FLP-file..." ),
TrackContainer::tr( "Cancel" ), 0, p.numChannels );
progressDialog.setWindowTitle( TrackContainer::tr( "Please wait..." ) );
progressDialog.show();
bool valid = false;

4
plugins/flp_import/FlpImport.h
View File

@@ -1,7 +1,7 @@
/*
* FlpImport.h - support for importing FLP-files
*
* Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -50,7 +50,7 @@ public:
private:
virtual bool tryImport( trackContainer * _tc );
virtual bool tryImport( TrackContainer* tc );
void processPluginParams( FL_Channel * _ch );

42
plugins/midi_import/MidiImport.cpp
View File

@@ -1,7 +1,7 @@
/*
* MidiImport.cpp - support for importing MIDI files
*
* Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -30,7 +30,7 @@
#include <QtGui/QProgressDialog>
#include "MidiImport.h"
#include "track_container.h"
#include "TrackContainer.h"
#include "InstrumentTrack.h"
#include "AutomationTrack.h"
#include "AutomationPattern.h"
@@ -87,7 +87,7 @@ MidiImport::~MidiImport()
bool MidiImport::tryImport( trackContainer * _tc )
bool MidiImport::tryImport( TrackContainer* tc )
{
if( openFile() == false )
{
@@ -124,11 +124,11 @@ bool MidiImport::tryImport( trackContainer * _tc )
{
case makeID( 'M', 'T', 'h', 'd' ):
printf( "MidiImport::tryImport(): found MThd\n");
return readSMF( _tc );
return readSMF( tc );
case makeID( 'R', 'I', 'F', 'F' ):
printf( "MidiImport::tryImport(): found RIFF\n");
return readRIFF( _tc );
return readRIFF( tc );
default:
printf( "MidiImport::tryImport(): not a Standard MIDI "
@@ -154,12 +154,11 @@ public:
AutomationPattern * ap;
midiTime lastPos;
smfMidiCC & create( trackContainer * _tc )
smfMidiCC & create( TrackContainer* tc )
{
if( !at )
{
at = dynamic_cast<AutomationTrack *>(
track::create( track::AutomationTrack, _tc ) );
at = dynamic_cast<AutomationTrack *>( track::create( track::AutomationTrack, tc ) );
}
return *this;
}
@@ -215,11 +214,10 @@ public:
bool hasNotes;
midiTime lastEnd;
smfMidiChannel * create( trackContainer * _tc )
smfMidiChannel * create( TrackContainer* tc )
{
if( !it ) {
it = dynamic_cast<InstrumentTrack *>(
track::create( track::InstrumentTrack, _tc ) );
it = dynamic_cast<InstrumentTrack *>( track::create( track::InstrumentTrack, tc ) );
#ifdef LMMS_HAVE_FLUIDSYNTH
it_inst = it->loadInstrument( "sf2player" );
@@ -262,15 +260,15 @@ public:
};
bool MidiImport::readSMF( trackContainer * _tc )
bool MidiImport::readSMF( TrackContainer* tc )
{
QString filename = file().fileName();
closeFile();
const int preTrackSteps = 2;
QProgressDialog pd( trackContainer::tr( "Importing MIDI-file..." ),
trackContainer::tr( "Cancel" ), 0, preTrackSteps, engine::mainWindow() );
pd.setWindowTitle( trackContainer::tr( "Please wait..." ) );
QProgressDialog pd( TrackContainer::tr( "Importing MIDI-file..." ),
TrackContainer::tr( "Cancel" ), 0, preTrackSteps, engine::mainWindow() );
pd.setWindowTitle( TrackContainer::tr( "Please wait..." ) );
pd.setWindowModality(Qt::WindowModal);
pd.setMinimumDuration( 0 );
@@ -318,7 +316,7 @@ bool MidiImport::readSMF( trackContainer * _tc )
pd.setValue( 2 );
// Tempo stuff
AutomationPattern * tap = _tc->tempoAutomationPattern();
AutomationPattern * tap = tc->tempoAutomationPattern();
if( tap )
{
tap->clear();
@@ -376,7 +374,7 @@ bool MidiImport::readSMF( trackContainer * _tc )
}
else if( evt->is_note() && evt->chan < 256 )
{
smfMidiChannel * ch = chs[evt->chan].create( _tc );
smfMidiChannel * ch = chs[evt->chan].create( tc );
Alg_note_ptr noteEvt = dynamic_cast<Alg_note_ptr>( evt );
note n( noteEvt->get_duration() * ticksPerBeat,
@@ -389,7 +387,7 @@ bool MidiImport::readSMF( trackContainer * _tc )
else if( evt->is_update() )
{
smfMidiChannel * ch = chs[evt->chan].create( _tc );
smfMidiChannel * ch = chs[evt->chan].create( tc );
double time = evt->time*ticksPerBeat;
QString update( evt->get_attribute() );
@@ -469,7 +467,7 @@ bool MidiImport::readSMF( trackContainer * _tc )
}
else
{
ccs[ccid].create( _tc );
ccs[ccid].create( tc );
ccs[ccid].putValue( time, objModel, cc );
}
}
@@ -492,7 +490,7 @@ bool MidiImport::readSMF( trackContainer * _tc )
{
printf(" Should remove empty track\n");
// must delete trackView first - but where is it?
//_tc->removeTrack( chs[c].it );
//tc->removeTrack( chs[c].it );
//it->deleteLater();
}
}
@@ -503,7 +501,7 @@ bool MidiImport::readSMF( trackContainer * _tc )
bool MidiImport::readRIFF( trackContainer * _tc )
bool MidiImport::readRIFF( TrackContainer* tc )
{
// skip file length
skip( 4 );
@@ -543,7 +541,7 @@ data_not_found:
{
goto invalid_format;
}
return readSMF( _tc );
return readSMF( tc );
}

8
plugins/midi_import/MidiImport.h
View File

@@ -1,7 +1,7 @@
/*
* MidiImport.h - support for importing MIDI-files
*
* Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -46,10 +46,10 @@ public:
private:
virtual bool tryImport( trackContainer * _tc );
virtual bool tryImport( TrackContainer* tc );
bool readSMF( trackContainer * _tc );
bool readRIFF( trackContainer * _tc );
bool readSMF( TrackContainer* tc );
bool readRIFF( TrackContainer* tc );
bool readTrack( int _track_end, QString & _track_name );
void error( void );