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

fixed recent commit (m_timeLine was not declared as member yet)

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@1886 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-12-08 20:40:08 +00:00
parent 7de629794a
commit 3c767040b3
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2008-12-08 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/song_editor.h:
* src/gui/song_editor.cpp:
fixed recent commit (m_timeLine was not declared as member yet)
2008-12-07 Andrew Kelley <superjoe30/at/gmail/dot/com>
* src/gui/song_editor.cpp:

2
include/song_editor.h
View File

@@ -106,6 +106,8 @@ private:
toolButton * m_stopButton;
lcdSpinBox * m_tempoSpinBox;
timeLine * m_timeLine;
meterDialog * m_timeSigDisplay;
automatableSlider * m_masterVolumeSlider;
automatableSlider * m_masterPitchSlider;

8
src/gui/song_editor.cpp
View File

@@ -87,7 +87,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
setFocus();
// create time-line
timeLine * tl = new timeLine( TRACK_OP_WIDTH +
m_timeLine = new timeLine( TRACK_OP_WIDTH +
DEFAULT_SETTINGS_WIDGET_WIDTH, 32,
pixelsPerTact(),
m_s->m_playPos[song::Mode_PlaySong],
@@ -95,7 +95,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
connect( this, SIGNAL( positionChanged( const midiTime & ) ),
m_s->m_playPos[song::Mode_PlaySong].m_timeLine,
SLOT( updatePosition( const midiTime & ) ) );
connect( tl, SIGNAL( positionChanged( const midiTime & ) ),
connect( m_timeLine, SIGNAL( positionChanged( const midiTime & ) ),
this, SLOT( updatePosition( const midiTime & ) ) );
m_positionLine = new positionLine( this );
@@ -232,7 +232,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
m_toolBar->setPalette( pal );
static_cast<QVBoxLayout *>( layout() )->insertWidget( 0, m_toolBar );
static_cast<QVBoxLayout *>( layout() )->insertWidget( 1, tl );
static_cast<QVBoxLayout *>( layout() )->insertWidget( 1, m_timeLine );
QHBoxLayout * tb_layout = new QHBoxLayout( m_toolBar );
tb_layout->setMargin( 0 );
@@ -357,7 +357,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
tb_layout->addWidget( m_drawModeButton );
tb_layout->addWidget( m_editModeButton );
tb_layout->addSpacing( 10 );
tl->addToolButtons( m_toolBar );
m_timeLine->addToolButtons( m_toolBar );
tb_layout->addSpacing( 15 );
tb_layout->addWidget( zoom_lbl );
tb_layout->addSpacing( 5 );