summaryrefslogtreecommitdiff
path: root/muse2/muse/marker/markerview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/marker/markerview.cpp')
-rw-r--r--muse2/muse/marker/markerview.cpp28
1 files changed, 3 insertions, 25 deletions
diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp
index a957e3bf..5e84295e 100644
--- a/muse2/muse/marker/markerview.cpp
+++ b/muse2/muse/marker/markerview.cpp
@@ -30,7 +30,6 @@
#include "sync.h"
#include "icons.h"
#include "song.h"
-///#include "posedit.h"
#include "awl/posedit.h"
#include <QCloseEvent>
@@ -121,7 +120,6 @@ void MarkerItem::setTick(unsigned v)
QString s;
int bar, beat;
unsigned tick;
- ///sigmap.tickValues(v, &bar, &beat, &tick);
AL::sigmap.tickValues(v, &bar, &beat, &tick);
s.sprintf("%04d.%02d.%03d", bar+1, beat+1, tick);
setText(COL_TICK, s);
@@ -168,10 +166,8 @@ void MarkerView::closeEvent(QCloseEvent* e)
//---------------------------------------------------------
MarkerView::MarkerView(QWidget* parent)
- : TopWin(TopWin::MARKER, parent, "markerview", Qt::Window /*| WDestructiveClose*/)
+ : TopWin(TopWin::MARKER, parent, "markerview", Qt::Window)
{
- //setAttribute(Qt::WA_DeleteOnClose);
-
setWindowTitle(tr("MusE: Marker"));
QAction* markerAdd = new QAction(QIcon(*flagIcon), tr("add marker"), this);
@@ -181,10 +177,6 @@ MarkerView::MarkerView(QWidget* parent)
connect(markerDelete, SIGNAL(activated()), SLOT(deleteMarker()));
//---------Pulldown Menu----------------------------
- /* We probably don't need an empty menu - Orcan
- QMenu* fileMenu = new QMenu(tr("&File"));
- menuBar()->addMenu(fileMenu);
- */
QMenu* editMenu = menuBar()->addMenu(tr("&Edit"));
editMenu->addAction(markerAdd);
@@ -238,7 +230,6 @@ MarkerView::MarkerView(QWidget* parent)
editTick->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
QSizePolicy::Fixed));
- ///editSMPTE = new PosEdit;
editSMPTE = new Awl::PosEdit;
editSMPTE->setSmpte(true);
editSMPTE->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
@@ -280,7 +271,6 @@ MarkerView::MarkerView(QWidget* parent)
// Rest
//---------------------------------------------------
- //connect(song, SIGNAL(songChanged(int)), SLOT(updateList()));
connect(MusEGlobal::song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
updateList();
@@ -296,14 +286,11 @@ MarkerView::MarkerView(QWidget* parent)
}
//---------------------------------------------------------
-// MArkerView
+// MarkerView
//---------------------------------------------------------
MarkerView::~MarkerView()
{
- //printf("MarkerView::~MarkerView() before undoRedo->removeFrom(tools)\n");
-
- // undoRedo->removeFrom(tools); // p4.0.6 Removed
}
//---------------------------------------------------------
@@ -507,9 +494,6 @@ void MarkerView::updateList()
MusECore::Marker* m = &i->second;
// Changed p3.3.43
- //QString tick;
- //tick.setNum(i->first);
- //new MarkerItem(table, m);
MarkerItem* item = new MarkerItem(table, m);
if(m == selm)
{
@@ -548,8 +532,6 @@ void MarkerView::markerSelectionChanged()
lock->setChecked(item->lock());
lock->setEnabled(true);
- //printf("MarkerView::markerSelectionChanged item->lock:%d\n", item->lock());
-
editSMPTE->setEnabled(item->lock());
editTick->setEnabled(!item->lock());
}
@@ -613,9 +595,6 @@ void MarkerView::lockChanged(bool lck)
void MarkerView::markerChanged(int val)
{
- //if (val != MusECore::Song::MARKER_CUR)
- // return;
- // p3.3.43
switch(val)
{
// MARKER_CUR, MARKER_ADD, MARKER_REMOVE, MARKER_NAME,
@@ -673,8 +652,7 @@ void MarkerView::prevMarker()
if (i->second.tick() < curPos && i->second.tick() > nextPos)
nextPos = i->second.tick();
}
-/* if (nextPos == 0)
- return;*/
+
MusECore::Pos p(nextPos, true);
MusEGlobal::song->setPos(0, p, true, true, false);
}