/* VLC-REMOTE for MAEMO 5
- * Copyright (C) 2010 Schutz Sacha <istdasklar@gmail.com>
+ * Copyright (C) 2010 Schutz Sacha <istdasklar@gmail.com>, Dru Moore <usr@dru-id.co.uk>
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
* or (at your option) any later version, as published by the Free
mContents = new QList<VlcPlayListElementSimple>();
+ ui->listWidget->setTextElideMode(Qt::ElideLeft);
+ ui->listWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
ui->playButton->setIcon(QIcon::fromTheme("camera_playback"));
ui->clearButton->setIcon(QIcon::fromTheme("general_delete"));
ui->shuffleButton->setIcon(QIcon::fromTheme("mediaplayer_default_shuffle"));
doc.setContent(this->mResponse);
QDomElement docElem = doc.documentElement();
QDomNodeList nodes = docElem.elementsByTagName("node");
-
int depth = 0;
int ct = nodes.count();
for (int idx = 0; idx < ct; ++idx) {
QDomNode node = nodes.at(idx);
- QString name = node.attributes().namedItem("name").nodeValue();
+ QString current = "";
+ //QString name = node.attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
int id = node.attributes().namedItem("id").nodeValue().toInt();
- if (3 == id) {
+ if (4 > id && 0 == QString::compare(node.attributes().namedItem("ro").nodeValue(), "ro")) {
// got the main playlist, let's build it up
if (node.hasChildNodes()) {
QDomNodeList leafs = node.childNodes();
QDomNode leaf = leafs.at(jdx);
VlcPlayListElementSimple* el = new VlcPlayListElementSimple();
el->id = leaf.attributes().namedItem("id").nodeValue().toInt();
- //el->path = leaf.attributes().namedItem("uri").nodeValue();
- el->name = leaf.attributes().namedItem("name").nodeValue();
+ el->path = leaf.attributes().namedItem("uri").nodeValue();
+ el->name = leaf.attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
+ current = leaf.attributes().namedItem("current").nodeValue();
+ el->playing = (0 < current.length());
+ el->depth = 1;
if (0 == QString::compare(leaf.nodeName(), "node")) {
- el->depth = 1;
el->type = "node";
+ el->extension = getExtension(el->path, NULL);
this->mContents->append(*el);
// now parse the child nodes as leafs.
if (leaf.hasChildNodes()) {
QDomNode item = items.at(kdx);
VlcPlayListElementSimple* it = new VlcPlayListElementSimple();
it->id = item.attributes().namedItem("id").nodeValue().toInt();
- //it->path = item.attributes().namedItem("uri").nodeValue();
- it->name = item.attributes().namedItem("name").nodeValue();
+ it->path = item.attributes().namedItem("uri").nodeValue();
+ it->name = item.attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
+ it->extension = getExtension(it->path, NULL);
it->depth = 2;
it->type = "leaf";
+ current = item.attributes().namedItem("current").nodeValue();
+ it->playing = (0 < current.length());
this->mContents->append(*it);
delete it;
}
}
}
else {
- el->depth = 1;
el->type = "leaf";
+ el->extension = getExtension(el->path, NULL);
this->mContents->append(*el);
}
delete el;
}
+QString PlayListMainWindow::getExtension(QString path, QString extension) {
+ // return extension if exists
+ if (!extension.isNull() && !extension.isEmpty()) return extension;
+ // return blank if no path
+ if (path.isNull() || path.isEmpty()) return "";
+ // otherwise extract the extension
+ int dot_pos = path.lastIndexOf('.');
+ if (0 < dot_pos) {
+ return path.right(path.length() - (dot_pos + 1));
+ }
+ else { // no dot
+ return "";
+ }
+}
+
VlcPlayListElementSimple PlayListMainWindow::getElementFromText(QString text) {
//if (0 != QString::compare("", text)) {
for (int idx = 0; idx < mContents->count(); ++idx) {
void PlayListMainWindow::updateList() {
int ct = this->mContents->count();
if (0 < ct) {
+ QIcon icon_audio = QIcon::fromTheme("general_audio_file");
+ QIcon icon_video = QIcon::fromTheme("general_video_file");
+ QIcon icon_image = QIcon::fromTheme("general_image");
+ QIcon icon_flash = QIcon::fromTheme("filemanager_flash_file");
+ QIcon icon_media = QIcon::fromTheme("filemanager_media_folder");
for (int idx = 0; idx < ct; ++idx) {
VlcPlayListElementSimple el = mContents->at(idx);
- QListWidgetItem* item;//
+ QListWidgetItem* item;
if (0 == QString::compare("node", el.type)) {
- item = new QListWidgetItem(QIcon::fromTheme("filemanager_media_folder"), el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id);
+ item = new QListWidgetItem(icon_media, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id);
}
else {
- item = new QListWidgetItem(QIcon::fromTheme("general_video_file"), el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id);
+ if ( 0 == QString::compare(el.extension, "jpg") ||
+ 0 == QString::compare(el.extension, "jpeg") ||
+ 0 == QString::compare(el.extension, "gif") ||
+ 0 == QString::compare(el.extension, "png") ||
+ 0 == QString::compare(el.extension, "bmp") ) {
+ item = new QListWidgetItem(icon_image, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .jpg, .jpeg, .gif, .png, .bmp
+ }
+ else if ( 0 == QString::compare(el.extension, "mp3") ||
+ 0 == QString::compare(el.extension, "m4a") ||
+ 0 == QString::compare(el.extension, "ogg") ||
+ 0 == QString::compare(el.extension, "oga") ||
+ 0 == QString::compare(el.extension, "wav") ||
+ 0 == QString::compare(el.extension, "flac") ) {
+ item = new QListWidgetItem(icon_audio, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .mp3, .m4a, .ogg, .oga, .wav, .flac
+ }
+ else if ( 0 == QString::compare(el.extension, "avi") ||
+ 0 == QString::compare(el.extension, "mpeg") ||
+ 0 == QString::compare(el.extension, "mpg") ||
+ 0 == QString::compare(el.extension, "mov") ||
+ 0 == QString::compare(el.extension, "mp4") ||
+ 0 == QString::compare(el.extension, "wmv") ||
+ 0 == QString::compare(el.extension, "mkv") ||
+ 0 == QString::compare(el.extension, "ogv") ) {
+ item = new QListWidgetItem(icon_video, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .avi, .mpg, .mpeg, .mov, .mp4, .wmv, .mkv, .ogv
+ }
+ else if ( 0 == QString::compare(el.extension, "flv") ) {
+ item = new QListWidgetItem(icon_flash, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .flv
+ }
+ else {
+ if (el.name.contains("Flash")) {
+ item = new QListWidgetItem(icon_flash, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id);
+ }
+ else {
+ item = new QListWidgetItem(icon_media, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id);
+ }
+ }
}
+ item->setSelected(el.playing);
ui->listWidget->addItem(item);
- /// TODO - Work out the file / media type and use an appropriate icon instead of the default.
+ if (el.playing) {
+ ui->listWidget->scrollToItem(item, QAbstractItemView::PositionAtCenter);
+ }
}
}
}
projects / vlc-remote / blobdiff