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

Update Timeline.h

Browse Source
This commit is contained in:
Alexandre Almeida
2015-01-07 21:14:55 -02:00
committed by Alexandre
parent 77ceda9385
commit 4d6d937cf2
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/TimeLineWidget.h
View File

@@ -61,11 +61,11 @@ public:
} ;
TimeLineWidget( int _xoff, int _yoff, float _ppt, Song::playPos & _pos,
const MidiTime & _begin, QWidget * _parent );
TimeLineWidget( int xoff, int yoff, float ppt, Song::playPos & pos,
const MidiTime & begin, QWidget * parent );
virtual ~TimeLineWidget();
inline Song::playPos & pos()
inline Song::PlayPos & pos()
{
return( m_pos );
}
@@ -163,7 +163,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];

20
src/gui/TimeLineWidget.cpp
View File

@@ -53,17 +53,17 @@ QPixmap * TimeLineWidget::s_loopPointEndPixmap = NULL;
TimeLineWidget::TimeLineWidget( const int xoff, const int yoff, const float ppt,
Song::playPos & pos, const MidiTime & begin,
QWidget * _parent ) :
QWidget( _parent ),
QWidget * parent ) :
QWidget( parent ),
m_autoScroll( AutoScrollEnabled ),
m_loopPoints( LoopPointsDisabled ),
m_behaviourAtStop( BackToZero ),
m_changedPosition( true ),
m_xOffset( _xoff ),
m_xOffset( xoff ),
m_posMarkerX( 0 ),
m_ppt( _ppt ),
m_pos( _pos ),
m_begin( _begin ),
m_ppt( ppt ),
m_pos( pos ),
m_begin( begin ),
m_savedPos( -1 ),
m_hint( NULL ),
m_action( NoAction ),
@@ -94,17 +94,17 @@ TimeLineWidget::TimeLineWidget( const int xoff, const int yoff, const float ppt,
}
setAttribute( Qt::WA_OpaquePaintEvent, true );
move( 0, _yoff );
move( 0, yoff );
setFixedHeight( s_timeLinePixmap->height() );
m_xOffset -= s_posMarkerPixmap->width() / 2;
m_pos.m_timeLine = this;
QTimer * update_timer = new QTimer( this );
connect( update_timer, SIGNAL( timeout() ),
QTimer * updateTimer = new QTimer( this );
connect( updateTimer, SIGNAL( timeout() ),
this, SLOT( updatePosition() ) );
update_timer->start( 50 );
updateTimer->start( 50 );
}