//#define AVOID_INPUT_DIALOG 0
MainWindow::MainWindow()
- : plman (this), settings (tr ("TomAmp"), "TomAmp")
+ : plman (this), settings (tr ("TomAmp"), "TomAmp"), isPlaying (false)
{
audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
mediaObject = new Phonon::MediaObject(this);
setupActions();
setupMenus();
setupUi();
- timeLcd->display("00:00");
+ timeLcd->display("00:00:00");
plman.addStringList(settings.value("lastPlaylist").toStringList());
setupShuffleList();
+ int curind = settings.value("currentIndex", -1).toInt ();
+ if (curind >= 0)
+ setItem (curind, false);
audioOutput->setVolume(settings.value("volume", .5).toReal());
+ QApplication::setWindowIcon(QIcon (QPixmap (":images/tomamp")));
}
MainWindow::~MainWindow()
settings.setValue("repeat", repeat);
settings.setValue("lastPlaylist", plman.playlistStrings());
settings.setValue("volume", audioOutput->volume());
+ settings.setValue("currentIndex", plman.indexOf(mediaObject->currentSource()));
+ for (int i = 0; i < musicTable->columnCount(); ++i)
+ {
+ QString lab = QString ("colWidth_%1").arg (i);
+ settings.setValue(lab, musicTable->columnWidth(i));
+ }
}
void MainWindow::addFiles()
if (folder.isEmpty())
folder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Files To Add"),
- folder);
+ folder, "Music files (*.mp3 *.ogg *.wav *.flac);;Playlists (*.m3u *.pls)");
if (files.isEmpty())
return;
QStringList toadd;
foreach (QString string, files)
{
- toadd.append (string);
+ if (string.toLower().endsWith(".pls") || string.toLower().endsWith(".m3u"))
+ plman.addPlaylist(string);
+ else
+ toadd.append (string);
}
plman.addStringList(toadd);
}
tr("Select Directory To Add"),
folder);
+ if (dir.isEmpty())
+ return;
+
+ settings.setValue("LastFolder", dir);
+
QStringList filters;
QStringList files = QDir (dir).entryList(filters, QDir::AllDirs);
files.removeAll(".");
files.removeAll("..");
- qDebug () << files;
bool recursive = false;
if (files.size())
recursive = QMessageBox::question(this, "Add all folders", "Subfolders have been detected, add everything?", QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes;
#else
QString url = QInputDialog::getText(this, "Get URL", "Please type in the stream URL");
#endif
+ if (url.isEmpty() || !url.toLower().startsWith("http"))
+ return;
QStringList toadd;
toadd << url;
plman.addStringList(toadd);
tr("TomAmp is a simple playlist-based music player.\n\n"
"(c) 2010 Tamas Marki <tmarki@gmail.com>\n\n"
"Please send comments and bug reports to the above e-mail address.\n\n"
- "Icons by deleket (http://www.deleket.com)"));
+ "Icons by http://itweek.deviantart.com/"));
}
void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState */)
{
- qDebug () << "State: " << newState;
switch (newState)
{
case Phonon::ErrorState:
// QMessageBox::warning(this, tr("Error"),
// mediaObject->errorString());
}
-// next ();
+ next ();
break;
case Phonon::PlayingState:
setWindowTitle(mediaObject->metaData().value("TITLE") + " - TomAmp");
playAction->setEnabled(false);
pauseAction->setEnabled(true);
stopAction->setEnabled(true);
+ //lastPlayed = plman.indexOf(mediaObject->currentSource());
break;
case Phonon::StoppedState:
+ setWindowTitle("TomAmp");
stopAction->setEnabled(false);
playAction->setEnabled(true);
pauseAction->setVisible(false);
playAction->setVisible(true);
pauseAction->setEnabled(false);
- timeLcd->display("00:00");
+ timeLcd->display("00:00:00");
+ unhighlightRow(plman.indexOf(mediaObject->currentSource()));
break;
case Phonon::PausedState:
pauseAction->setEnabled(false);
pauseAction->setVisible(false);
playAction->setVisible(true);
playAction->setEnabled(true);
- qDebug () << "Queue size: " << mediaObject->queue().size ();
- if (mediaObject->queue().size ())
- {
- mediaObject->setCurrentSource(mediaObject->queue()[0]);
- musicTable->selectRow(plman.indexOf(mediaObject->currentSource()));
- mediaObject->play();
- }
- mediaObject->clearQueue();
break;
case Phonon::BufferingState:
- qDebug () << "Buffering";
break;
default:
;
void MainWindow::next()
{
- bool wasPlaying = (mediaObject->state () == Phonon::PlayingState);
+ bool wasPlaying = isPlaying;
if (mediaObject->state () == Phonon::ErrorState)
wasPlaying = true;
- qDebug () << "Getting index of current playing";
int index = plman.indexOf(mediaObject->currentSource());
- qDebug () << "Next index is " << index;
if (shuffle)
{
- qDebug () << "Shuffle next";
- index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource()));
- do
+ index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) + 1;
+ while (index < shuffleList.size () && !plman.getItem(shuffleList[index]).playable)
{
index += 1;
- qDebug () << "Index increase a " << index;
}
- while (index < shuffleList.size () && !plman.getItem(index).playable);
- qDebug () << "Shuffle next 2 " << index;
if (index < shuffleList.size ())
{
- mediaObject->setCurrentSource(plman.at (shuffleList[index]));
+ setItem (index, wasPlaying);
}
else if (repeat)
{
index = 0;
- do
+ while ((index) < shuffleList.size () && !plman.getItem(shuffleList[index]).playable)
{
- qDebug () << "Index increase 2a " << index;
index += 1;
}
- while (index < shuffleList.size () && !plman.getItem(index).playable);
- if (index < shuffleList.size ())
- mediaObject->setCurrentSource(plman.at (shuffleList[index]));
+ setItem (index, wasPlaying);
}
-
}
else
{
- qDebug () << "Normal next";
- while ((index + 1) < plman.size ())
+ index++;
+ while ((index) < plman.size () && !plman.getItem(index).playable)
{
index += 1;
- qDebug () << "Index increase " << index;
- if (plman.getItem(index).playable)
- break;
}
- qDebug () << "Normal next 2 " << index;
- if (plman.size() > index)
+ if (index < plman.size())
{
- mediaObject->setCurrentSource(plman.at(index));
+ setItem (index, wasPlaying);
}
else if (repeat)
{
index = 0;
- do
+ while ((index) < plman.size () && !plman.getItem(index).playable)
{
- qDebug () << "Index increase 2 " << index;
index += 1;
- if (plman.getItem(index).playable)
- break;
}
- while ((index + 1) < shuffleList.size ());
- mediaObject->setCurrentSource(plman.at(index));
+ setItem (index, wasPlaying);
+ }
+ }
+}
+
+void MainWindow::setItem(int i, bool doplay)
+{
+ if (i < plman.size() && i >= 0)
+ {
+ if (lastPlayed >= 0)
+ unhighlightRow(lastPlayed);
+ if (shuffle)
+ {
+ mediaObject->setCurrentSource(plman.at (shuffleList[i]));
+ }
+ else
+ {
+ mediaObject->setCurrentSource(plman.at(i));
}
}
- musicTable->selectRow (plman.indexOf(mediaObject->currentSource()));
- if (wasPlaying)
- mediaObject->play();
+ if (doplay && mediaObject->currentSource().type() != Phonon::MediaSource::Invalid)
+ {
+ play();
+ }
+ else
+ stop ();
}
void MainWindow::previous()
{
- bool wasPlaying = (mediaObject->state () == Phonon::PlayingState);
- int index = plman.indexOf(mediaObject->currentSource()) - 1;
+ bool wasPlaying = isPlaying;//(mediaObject->state () == Phonon::PlayingState);
+ if (mediaObject->state () == Phonon::ErrorState)
+ wasPlaying = true;
+ int index = plman.indexOf(mediaObject->currentSource());
if (shuffle)
{
index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) - 1;
+ while (index >= 0 && !plman.getItem(shuffleList[index]).playable)
+ {
+ index--;
+ }
if (index >= 0)
{
- mediaObject->setCurrentSource(plman.at (shuffleList[index]));
+ setItem (index, wasPlaying);
}
else if (repeat)
{
- mediaObject->setCurrentSource(plman.at (shuffleList[shuffleList.size() - 1]));
+ index = plman.size () - 1;
+ while (index >= 0 && !plman.getItem(shuffleList[index]).playable)
+ {
+ index--;
+ }
+ setItem (index, wasPlaying);
}
+/* if (index < 0)
+ wasPlaying = false;*/
}
else
{
+ index--;
+ while ((index) >= 0 && !plman.getItem(index).playable)
+ {
+ index--;
+ }
if (index >= 0)
{
- mediaObject->setCurrentSource(plman.at(index));
+ setItem (index, wasPlaying);
}
else if (repeat)
{
- mediaObject->setCurrentSource(plman.at(plman.size() - 1));
+ index = plman.size() - 1;
+ while ((index) >= 0 && !plman.getItem(index).playable)
+ {
+ index--;
+ }
+ setItem (index, wasPlaying);
}
}
- if (wasPlaying)
- mediaObject->play();
+}
+void MainWindow::highlightRow (int i)
+{
+ for (int j = 0; j < 3; ++j)
+ {
+ QTableWidgetItem* item = musicTable->item(i, j);
+ if (item)
+ {
+ QFont font = item->font();
+ font.setBold(true);
+ font.setItalic(true);
+ item->setFont(font);
+ }
+ }
}
+void MainWindow::unhighlightRow (int i)
+{
+ for (int j = 0; j < 3; ++j)
+ {
+ QTableWidgetItem* item = musicTable->item(i, j);
+ if (item)
+ {
+ QFont font = item->font();
+ font.setBold(false);
+ font.setItalic(false);
+ item->setFont(font);
+ }
+ }
+}
+
+
void MainWindow::tick(qint64 time)
{
- QTime displayTime(0, (time / 60000) % 60, (time / 1000) % 60);
+ QTime displayTime((time / 3600000), (time / 60000) % 60, (time / 1000) % 60);
- timeLcd->display(displayTime.toString("mm:ss"));
+ timeLcd->display(displayTime.toString("HH:mm:ss"));
}
void MainWindow::tableClicked(int row, int /* column */)
{
// bool wasPlaying = mediaObject->state() == Phonon::PlayingState;
- mediaObject->stop();
- mediaObject->clearQueue();
+/* mediaObject->stop();
+ mediaObject->clearQueue();*/
if (row >= plman.size())
return;
int index = row;
- while (index < plman.size () && !plman.getItem(index).playable)
+ while (index < shuffleList.size () && !plman.getItem(index).playable)
{
index += 1;
}
if (plman.size() > index)
{
- mediaObject->setCurrentSource(plman.at(index));
- int ind = shuffleList.indexOf(index);
- shuffleList.removeAt(ind);
- shuffleList.insert(0, index);
- qDebug () << "Modified shuffle list: " << shuffleList;
- mediaObject->play();
+ if (shuffle)
+ index = shuffleList.indexOf(index);
+ setItem (index, true);
+// mediaObject->play();
}
else
{
- next ();
+ index = 0;
+ while (index < plman.size () && !plman.getItem(index).playable)
+ {
+ index += 1;
+ }
+ if (plman.size() > index)
+ {
+ if (shuffle)
+ index = shuffleList.indexOf(index);
+ setItem (index, true);
+// mediaObject->play();
+ }
}
}
void MainWindow::sourceChanged(const Phonon::MediaSource &source)
{
- musicTable->selectRow(plman.indexOf(source));
- timeLcd->display("00:00");
+ int ind = plman.indexOf(source);
+ highlightRow(ind);
+ unhighlightRow(lastPlayed);
+ lastPlayed = ind;
+ musicTable->selectRow(ind);
+ timeLcd->display("00:00:00");
}
void MainWindow::aboutToFinish()
{
- qDebug () << "Abouttotfinish";
int index = plman.indexOf(mediaObject->currentSource()) + 1;
if (shuffle)
{
if (plman.size() > index)
{
mediaObject->enqueue(plman.at(index));
- qDebug () << "Enqueue " << index << " pfm " << mediaObject->prefinishMark();
}
else if (repeat)
{
mediaObject->enqueue(plman.at(0));
- qDebug () << "Enqueue " << 0 << " pfm " << mediaObject->prefinishMark();
}
}
}
void MainWindow::finished()
{
- qDebug () << "Finished";
}
void MainWindow::setupActions()
{
- playAction = new QAction(QIcon (QPixmap (":images/play")), tr("Play"), this);
+ playAction = new QAction(QIcon (QPixmap (":images/play")), "", this);
playAction->setShortcut(tr("Crl+P"));
playAction->setDisabled(true);
- pauseAction = new QAction(QIcon (QPixmap (":images/pause")), tr("Pause"), this);
+ pauseAction = new QAction(QIcon (QPixmap (":images/pause")), "", this);
pauseAction->setShortcut(tr("Ctrl+A"));
pauseAction->setDisabled(true);
pauseAction->setVisible(false);
- stopAction = new QAction(QIcon (QPixmap (":images/stop")), tr("Stop"), this);
+ stopAction = new QAction(QIcon (QPixmap (":images/stop")), "", this);
stopAction->setShortcut(tr("Ctrl+S"));
stopAction->setDisabled(true);
- nextAction = new QAction(QIcon (QPixmap (":images/next")), tr("Next"), this);
+ nextAction = new QAction(QIcon (QPixmap (":images/next")), "", this);
nextAction->setShortcut(tr("Ctrl+N"));
- previousAction = new QAction(QIcon (QPixmap (":images/previous")), tr("Previous"), this);
+ previousAction = new QAction(QIcon (QPixmap (":images/previous")), "", this);
previousAction->setShortcut(tr("Ctrl+R"));
- repeatAction = new QAction(QIcon (QPixmap (":images/repeat")), tr("Repeat"), this);
+ if (repeat)
+ repeatAction = new QAction(QIcon (QPixmap (":images/repeatActive")), "", this);
+ else
+ repeatAction = new QAction(QIcon (QPixmap (":images/repeat")), "", this);
repeatAction->setCheckable(true);
repeatAction->setChecked(repeat);
repeatAction->setShortcut(tr("Ctrl+I"));
- shuffleAction = new QAction(QIcon (QPixmap (":images/shuffle")), tr("Shuffle"), this);
+ if (shuffle)
+ shuffleAction = new QAction(QIcon (QPixmap (":images/shuffleActive")), "", this);
+ else
+ shuffleAction = new QAction(QIcon (QPixmap (":images/shuffle")), "", this);
shuffleAction->setCheckable(true);
shuffleAction->setChecked(shuffle);
shuffleAction->setShortcut(tr("Ctrl+H"));
- volumeAction = new QAction(QIcon (QPixmap (":images/volume")), tr("Volume"), this);
+ volumeAction = new QAction(QIcon (QPixmap (":images/volume")), "", this);
volumeAction->setCheckable(true);
volumeAction->setShortcut(tr("Ctrl+V"));
addFilesAction = new QAction(tr("Add &File"), this);
aboutAction->setShortcut(tr("Ctrl+B"));
aboutQtAction = new QAction(tr("About &Qt"), this);
aboutQtAction->setShortcut(tr("Ctrl+Q"));
+/* removeSelected = new QAction (tr("&Delete from playlist"));
+ removeSelected->setShortcut(tr ("Ctrl+D"));*/
- connect(playAction, SIGNAL(triggered()), mediaObject, SLOT(play()));
+ connect(playAction, SIGNAL(triggered()), this, SLOT(play()));
connect(pauseAction, SIGNAL(triggered()), mediaObject, SLOT(pause()) );
- connect(stopAction, SIGNAL(triggered()), mediaObject, SLOT(stop()));
+ connect(stopAction, SIGNAL(triggered()), this, SLOT(stop()));
connect(repeatAction, SIGNAL(triggered()), this, SLOT(repeatToggle()));
connect(shuffleAction, SIGNAL(triggered()), this, SLOT(shuffleToggle()));
connect(volumeAction, SIGNAL(triggered()), this, SLOT(volumeToggle()));
+
connect(addFilesAction, SIGNAL(triggered()), this, SLOT(addFiles()));
connect(addFoldersAction, SIGNAL(triggered()), this, SLOT(addFolder()));
connect(addUrlAction, SIGNAL(triggered()), this, SLOT(addUrl()));
connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+// connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem()));
}
+void MainWindow::removeSelectedItem()
+{
+ if (QMessageBox::question(this, "Confirm remove", "Are you sure you want to remove this item?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
+ return;
+ int row = musicTable->currentRow();
+ if (row >= 0)
+ plman.removeItem(row);
+}
+
+void MainWindow::removeAllButSelectedItem()
+{
+ if (QMessageBox::question(this, "Confirm remove", "Are you sure you want to remove all other items?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
+ return;
+ int row = musicTable->currentRow();
+ if (row >= 0)
+ {
+ QString uri = plman.getItem(row).uri;
+ QStringList lst;
+ lst << uri;
+ plman.clearPlaylist();
+ plman.addStringList(lst);
+ }
+}
void MainWindow::repeatToggle ()
{
repeat = !repeat;
- qDebug() << "Repeat toggled to " << repeat;
settings.setValue("repeat", QVariant (repeat));
+ if (repeat)
+ repeatAction->setIcon(QIcon (QPixmap (":images/repeatActive")));
+ else
+ repeatAction->setIcon(QIcon (QPixmap (":images/repeat")));
}
void MainWindow::shuffleToggle ()
{
shuffle = !shuffle;
settings.setValue("shuffle", QVariant (shuffle));
+ if (shuffle)
+ shuffleAction->setIcon(QIcon (QPixmap (":images/shuffleActive")));
+ else
+ shuffleAction->setIcon(QIcon (QPixmap (":images/shuffle")));
}
void MainWindow::volumeToggle ()
{
- qDebug () << "Volumetoggle: " << volumeAction->isChecked();
volumeSlider->setVisible(volumeAction->isChecked());
}
void MainWindow::play()
{
+ mediaObject->play();
+ lastPlayed = plman.indexOf(mediaObject->currentSource());
+ highlightRow(lastPlayed);
+ isPlaying = true;
+}
+void MainWindow::stop()
+{
+ mediaObject->stop();
+ isPlaying = false;
}
bar->addAction(nextAction);
bar->addAction(previousAction);
-/* QLabel *volumeLabel = new QLabel;
- volumeLabel->setPixmap(QPixmap("images/volume.png"));*/
+ contextMenu = new QMenu (this);
+ removeSelected = contextMenu->addAction(tr ("Remove selected"));
+ removeAllButSelected = contextMenu->addAction(tr("Remove all but selected"));
+ connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem()));
+ connect (removeAllButSelected, SIGNAL (triggered()), this, SLOT (removeAllButSelectedItem()));
-/* QPalette palette;
- palette.setBrush(QPalette::Light, Qt::darkGray);*/
timeLcd = new QLCDNumber;
-// timeLcd->setPalette(palette);
QStringList headers;
- headers << tr("Artist") << tr("Title") << tr("Album");
+ headers << tr("Artist") << tr("Title") << tr("Album") << "Controls";
- musicTable = new QTableWidget(0, 3);
+ musicTable = new QTableWidget(0, 4);
musicTable->setHorizontalHeaderLabels(headers);
musicTable->setSelectionMode(QAbstractItemView::SingleSelection);
musicTable->setSelectionBehavior(QAbstractItemView::SelectRows);
this, SLOT(tableClicked(int,int)));
connect(musicTable, SIGNAL(cellClicked(int,int)),
this, SLOT(cellClicked(int,int)));
- musicTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+/* for (int i = 0; i < 3; ++i)
+ {
+ if (!musicTable->horizontalHeaderItem(i))
+ continue;
+ musicTable->horizontalHeaderItem(i)->setBackgroundColor(QColor (128, 128, 255));;
+ musicTable->horizontalHeaderItem(i)->setForeground(QColor (255, 255, 255));
+ }*/
+ for (int i = 0; i < musicTable->columnCount(); ++i)
+ {
+ QString lab = QString ("colWidth_%1").arg (i);
+ int val = settings.value(lab, 0).toInt();
+ if (val)
+ musicTable->setColumnWidth(i, val);
+// settings.setValue(lab, musicTable->columnWidth(i));
+ }
+
QHBoxLayout *seekerLayout = new QHBoxLayout;
QToolBar* bar2 = new QToolBar;
QVBoxLayout *playbackLayout = new QVBoxLayout;
volumeSlider->hide ();
playbackLayout->addWidget(bar);
-// playbackLayout->addStretch();
-// playbackLayout->addWidget(volumeSlider);
-// playbackLayout->addWidget(volumeLabel);
QVBoxLayout *seekAndTableLayout = new QVBoxLayout;
setCentralWidget(widget);
setWindowTitle("TomAmp");
- qDebug () << "cucc: " << musicTable->columnWidth(1);
}
void MainWindow::cellClicked(int /*row*/, int)
{
- /*if (mediaObject->state() == Phonon::PlayingState)
- {
- int index = plman.indexOf(mediaObject->currentSource());
- if (index >= 0)
- {
- musicTable->selectRow(index);
- }
- }
- else if (row < plman.size())
- {
- mediaObject->setCurrentSource(plman.at(row));
- shuffleList.removeAll(row);
- shuffleList.insert(0, row);
- qDebug () << shuffleList;
- }*/
}
+void MainWindow::contextMenuEvent (QContextMenuEvent*e)
+{
+ if (!childAt (e->pos()))
+ return;
+ if (childAt (e->pos())->parentWidget() != musicTable)
+ return;
+ contextMenu->popup(e->globalPos());
+}
+
+
void MainWindow::setupShuffleList()
{
QList<int> tmp;
shuffleList.append(tmp[ind]);
tmp.removeAt(ind);
}
- qDebug () << shuffleList;
- qDebug () << shuffleList;
}
void MainWindow::savePlaylist ()
{
- QString filename = QFileDialog::getSaveFileName(this, tr("Please select file name"), "", "Playlist Files (*.m3u)");
- plman.loadPlaylist(filename);
+ QString filename = QFileDialog::getSaveFileName(this, tr("Please select file name"), "", "Playlist Files (*.m3u *.pls)");
+ if (filename.isEmpty())
+ return;
+ plman.savePlaylist(filename);
}
void MainWindow::loadPlaylist ()
{
- QString filename = QFileDialog::getOpenFileName(this, tr("Select playlist file to load"), "", "*.m3u");
+ QString filename = QFileDialog::getOpenFileName(this, tr("Select playlist file to load"), "", "*.m3u *.pls");
+ if (filename.isEmpty())
+ return;
plman.loadPlaylist (filename);
}
{
musicTable->removeRow(musicTable->rowCount () - 1);
}
+ int firstGood = -1;
for (int i = from; i < plman.size (); ++i)
{
+ if (firstGood < 0 && plman.getItem (i).playable)
+ firstGood = i;
int currentRow = musicTable->rowCount();
musicTable->insertRow(currentRow);
setRowFromItem (currentRow, plman.getItem(i));
}
+/* if (plman.indexOf(mediaObject->currentSource()) < 0)
+ {
+ setItem (firstGood, false);
+ }*/
setupShuffleList();
}
item3->setFlags(item3->flags() ^ Qt::ItemIsEditable);
musicTable->setItem(row, 2, item3);
}
+ qDebug () << "Widget: " << musicTable->cellWidget(row, 3);
+
+ if (!musicTable->cellWidget(row, 3))
+ {
+ QToolBar* bar = new QToolBar;
+ QPushButton* up = new QPushButton;
+ up->setText("up");
+ up->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ bar->setProperty("row", row);
+ bar->addWidget(up);
+ musicTable->setCellWidget(row, 3, bar);
+ connect (up, SIGNAL (clicked ()), this, SLOT (buttonUp ()));
+ }
+}
+
+void MainWindow::buttonUp()
+{
+ qDebug () << "Presses up on " << sender()->parent()->property("row");
+ plman.moveItemUp(sender()->parent()->property("row").toInt());
}
void MainWindow::itemUpdated(int index)
{
+ if (plman.indexOf(mediaObject->currentSource()) < 0 && plman.getItem (index).playable)
+ {
+ setItem (index, false);
+ }
setRowFromItem (index, plman.getItem(index));
+ if (plman.indexOf(mediaObject->currentSource()) == index)
+ {
+ if (shuffle) index = shuffleList.indexOf(index);
+ setItem (index, false);
+ }
}