slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Conflicts:
	.qmake.conf

Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
This commit is contained in:
Frederik Gladhorn
2014-01-17 17:20:59 +01:00
parent 16aadf964d 88ef2bf83d
commit 422099e8dd
35 changed files with 290 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h
View File

@@ -45,6 +45,8 @@
#include <qvideodeviceselectorcontrol.h>
#include <QtCore/qstringlist.h>
#include <gst/gst.h>
QT_BEGIN_NAMESPACE
class QGstreamerVideoInputDeviceControl : public QVideoDeviceSelectorControl
@@ -52,6 +54,7 @@ class QGstreamerVideoInputDeviceControl : public QVideoDeviceSelectorControl
Q_OBJECT
public:
QGstreamerVideoInputDeviceControl(QObject *parent);
QGstreamerVideoInputDeviceControl(GstElement *source, QObject *parent);
~QGstreamerVideoInputDeviceControl();
int deviceCount() const;
@@ -68,6 +71,8 @@ public Q_SLOTS:
private:
void update();
GstElement *m_source;
int m_selectedDevice;
QStringList m_names;
QStringList m_descriptions;

12
src/multimedia/playback/playlistfileparser.cpp
View File

@@ -100,7 +100,7 @@ public:
m_extraInfo.clear();
int artistStart = line.indexOf(QLatin1String(","), 8);
bool ok = false;
int length = line.mid(8, artistStart < 8 ? -1 : artistStart - 8).trimmed().toInt(&ok);
int length = line.midRef(8, artistStart < 8 ? -1 : artistStart - 8).trimmed().toInt(&ok);
if (ok && length > 0) {
//convert from second to milisecond
m_extraInfo[QMediaMetaData::Duration] = QVariant(length * 1000);
@@ -108,13 +108,13 @@ public:
if (artistStart > 0) {
int titleStart = getSplitIndex(line, artistStart);
if (titleStart > artistStart) {
m_extraInfo[QMediaMetaData::Author] = line.mid(artistStart + 1,
titleStart - artistStart - 1).trimmed().
m_extraInfo[QMediaMetaData::Author] = line.midRef(artistStart + 1,
titleStart - artistStart - 1).trimmed().toString().
replace(QLatin1String("--"), QLatin1String("-"));
m_extraInfo[QMediaMetaData::Title] = line.mid(titleStart + 1).trimmed().
m_extraInfo[QMediaMetaData::Title] = line.midRef(titleStart + 1).trimmed().toString().
replace(QLatin1String("--"), QLatin1String("-"));
} else {
m_extraInfo[QMediaMetaData::Title] = line.mid(artistStart + 1).trimmed().
m_extraInfo[QMediaMetaData::Title] = line.midRef(artistStart + 1).trimmed().toString().
replace(QLatin1String("--"), QLatin1String("-"));
}
}
@@ -302,7 +302,7 @@ Version=2
emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing playlist at line[%1]:%2")).arg(QString::number(lineIndex), line));
return QString();
}
return line.mid(start + 1).trimmed();
return line.midRef(start + 1).trimmed().toString();
}
void setCount(int count) {