diff --git a/ChangeLog b/ChangeLog index a9b0aa328..d7bdbbad3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-08 Tobias Doerffel + + * 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 * src/gui/song_editor.cpp: diff --git a/include/song_editor.h b/include/song_editor.h index 041adb304..b21247419 100644 --- a/include/song_editor.h +++ b/include/song_editor.h @@ -106,6 +106,8 @@ private: toolButton * m_stopButton; lcdSpinBox * m_tempoSpinBox; + timeLine * m_timeLine; + meterDialog * m_timeSigDisplay; automatableSlider * m_masterVolumeSlider; automatableSlider * m_masterPitchSlider; diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index 399a5a468..6542a4edf 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -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( layout() )->insertWidget( 0, m_toolBar ); - static_cast( layout() )->insertWidget( 1, tl ); + static_cast( 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 );