Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make use of KUrl in plasma phonon call

Browse source 
KUrl handles "file://" appending when neccessary
This commit is contained in:
Ivailo Monev 2014-12-31 01:03:47 +00:00
parent c4af529e42
commit a636636b0e
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plasma/widgets/videowidget.cpp
View file

@ -167,7 +167,7 @@ void VideoWidgetPrivate::showOpenFileDialog()
void VideoWidgetPrivate::openFile(const QString &path) void VideoWidgetPrivate::openFile(const QString &path)
{ {
media->setCurrentSource(Phonon::MediaSource(path)); media->setCurrentSource(Phonon::MediaSource(KUrl(path)));
media->play(); media->play();
} }
@ -282,18 +282,11 @@ Phonon::AudioOutput *VideoWidget::audioOutput() const
void VideoWidget::setUrl(const QString &url) void VideoWidget::setUrl(const QString &url)
{ {
QString fileUrl; if (url == d->media->currentSource().url().toString()) {
if (url.startsWith('/')) {
fileUrl = "file://" % url;
} else {
fileUrl = url;
}
if (fileUrl == d->media->currentSource().url().toString()) {
return; return;
} }
d->media->setCurrentSource(Phonon::MediaSource(fileUrl)); d->media->setCurrentSource(Phonon::MediaSource(KUrl(url)));
} }
QString VideoWidget::url() const QString VideoWidget::url() const