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

Rename song to Song

Browse Source
This commit is contained in:
Lukas W
2014-11-26 00:44:41 +01:00
parent 14eb54d53e
commit 7d0e3945e5
68 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/PianoRoll.h
View File

@@ -34,7 +34,7 @@
#include "SerializingObject.h"
#include "note.h"
#include "lmms_basics.h"
#include "song.h"
#include "Song.h"
#include "tooltip.h"
class QPainter;
@@ -83,7 +83,7 @@ public:
return m_pattern != NULL;
}
song::PlayModes desiredPlayModeForAccompany() const;
Song::PlayModes desiredPlayModeForAccompany() const;
int quantization() const;

10
include/song.h → include/Song.h
View File

@@ -1,5 +1,5 @@
/*
* song.h - class song - the root of the model-tree
* Song.h - class song - the root of the model-tree
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -45,7 +45,7 @@ const bpm_t MaxTempo = 999;
const tick_t MaxSongLength = 9999 * DefaultTicksPerTact;
class EXPORT song : public TrackContainer
class EXPORT Song : public TrackContainer
{
Q_OBJECT
mapPropertyFromModel(int,getTempo,setTempo,m_tempoModel);
@@ -300,9 +300,9 @@ private slots:
private:
song();
song( const song & );
virtual ~song();
Song();
Song( const Song & );
virtual ~Song();
inline tact_t currentTact() const

6
include/SongEditor.h
View File

@@ -36,7 +36,7 @@ class automatableSlider;
class comboBox;
class LcdSpinBox;
class MeterDialog;
class song;
class Song;
class textFloat;
class timeLine;
class toolButton;
@@ -56,7 +56,7 @@ class SongEditor : public TrackContainerView
{
Q_OBJECT
public:
SongEditor( song * _song );
SongEditor( Song * _song );
virtual ~SongEditor();
void setPauseIcon( bool pause );
@@ -98,7 +98,7 @@ private:
virtual bool allowRubberband() const;
song * m_s;
Song * m_song;
QScrollBar * m_leftRightScroll;

6
include/engine.h
View File

@@ -44,7 +44,7 @@ class MainWindow;
class Mixer;
class PianoRoll;
class projectNotes;
class song;
class Song;
class SongEditor;
class ladspa2LMMS;
class ControllerRackView;
@@ -82,7 +82,7 @@ public:
return s_fxMixer;
}
static song * getSong()
static Song * getSong()
{
return s_song;
}
@@ -178,7 +178,7 @@ private:
// core
static Mixer *s_mixer;
static FxMixer * s_fxMixer;
static song * s_song;
static Song * s_song;
static bbTrackContainer * s_bbTrackContainer;
static ProjectJournal * s_projectJournal;
static DummyTrackContainer * s_dummyTC;

8
include/timeline.h
View File

@@ -28,7 +28,7 @@
#include <QWidget>
#include "song.h"
#include "Song.h"
class QPixmap;
@@ -60,11 +60,11 @@ public:
} ;
timeLine( int _xoff, int _yoff, float _ppt, song::playPos & _pos,
timeLine( int _xoff, int _yoff, float _ppt, Song::playPos & _pos,
const MidiTime & _begin, QWidget * _parent );
virtual ~timeLine();
inline song::playPos & pos()
inline Song::playPos & pos()
{
return( m_pos );
}
@@ -162,7 +162,7 @@ private:
int m_xOffset;
int m_posMarkerX;
float m_ppt;
song::playPos & m_pos;
Song::playPos & m_pos;
const MidiTime & m_begin;
MidiTime m_loopPos[2];