iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Qt4 support

Browse Source
This commit is contained in:
Craig Drummond
2017-04-02 18:43:34 +01:00
parent e60bdafa11
commit 18e2fb6dcf
109 changed files with 137 additions and 10424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mpd-interface/httpstream.cpp
View File

@@ -25,9 +25,6 @@
#include "mpdconnection.h"
#include "mpdstatus.h"
#include "gui/settings.h"
#if QT_VERSION < 0x050000
#include <phonon/audiooutput.h>
#endif
HttpStream::HttpStream(QObject *p)
: QObject(p)
@@ -87,11 +84,6 @@ void HttpStream::streamUrl(const QString &url)
media = libvlc_media_new_location(instance, byteArrayUrl.constData());
player = libvlc_media_player_new_from_media(media);
libvlc_media_release(media);
#elif QT_VERSION < 0x050000
player=new Phonon::MediaObject(this);
Phonon::createPath(player, new Phonon::AudioOutput(Phonon::MusicCategory, this));
player->setCurrentSource(QUrl(url));
player->setProperty(constUrlProperty, url);
#else
player=new QMediaPlayer(this);
player->setMedia(QUrl(url));
@@ -107,10 +99,6 @@ void HttpStream::streamUrl(const QString &url)
if(libvlc_media_player_get_state(player)!=libvlc_Playing){
libvlc_media_player_play(player);
}
#elif QT_VERSION < 0x050000
if (Phonon::PlayingState!=player->state()) {
player->play();
}
#else
if (QMediaPlayer::PlayingState!=player->state()) {
player->play();
@@ -159,10 +147,6 @@ void HttpStream::updateStatus()
if (libvlc_Playing!=libvlc_media_player_get_state(player)) {
libvlc_media_player_play(player);
}
#elif QT_VERSION < 0x050000
if (Phonon::PlayingState!=player->state()) {
player->play();
}
#else
if (QMediaPlayer::PlayingState!=player->state()) {
player->play();