diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-12-09 07:41:47 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-12-09 07:41:47 +0000 |
| commit | 703f47458a859c9559c13038246dd37529eba6ff (patch) | |
| tree | e0676d3c7aff9362683c06fed8416d191ae13542 /muse2/muse/transport.cpp | |
| parent | d184da8dfd7cf98f0e6fcd468cb4c8a4bde55177 (diff) | |
Made MusE the owner of transport object. Improved PosEdit class.
Diffstat (limited to 'muse2/muse/transport.cpp')
| -rw-r--r-- | muse2/muse/transport.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/muse2/muse/transport.cpp b/muse2/muse/transport.cpp index 36b0486d..0e2a33e0 100644 --- a/muse2/muse/transport.cpp +++ b/muse2/muse/transport.cpp @@ -220,11 +220,12 @@ void Transport::setRecord(bool flag) // Transport //--------------------------------------------------------- -Transport::Transport(QWidget*, const char* name) +Transport::Transport(QWidget* parent, const char* name) // : QWidget(0, name, WStyle_Customize | WType_TopLevel | WStyle_Tool //| WStyle_NoBorder | WStyle_StaysOnTop) //: QWidget(0, name, Qt::WStyle_Customize | Qt::Window | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop) - : QWidget(0, Qt::Window | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint ) // Possibly also Qt::X11BypassWindowManagerHint + //: QWidget(0, name, Qt::Window | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint ) // Possibly also Qt::X11BypassWindowManagerHint + : QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint ) // Possibly also Qt::X11BypassWindowManagerHint { setObjectName(name); setWindowTitle(QString("Muse: Transport")); @@ -500,6 +501,11 @@ Transport::Transport(QWidget*, const char* name) hbox->addWidget(righthandle); } +Transport::~Transport() +{ + //printf("Transport::~Transport\n"); +} + //--------------------------------------------------------- // configChanged //--------------------------------------------------------- @@ -561,9 +567,12 @@ void Transport::setPos(int idx, unsigned v, bool) case 0: time1->setValue(v); time2->setValue(v); - slider->blockSignals(true); - slider->setValue(v); - slider->blockSignals(false); + if(slider->value() != v) + { + slider->blockSignals(true); + slider->setValue(v); + slider->blockSignals(false); + } if (song->masterFlag()) setTempo(tempomap.tempo(v)); { |