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

#ifdef for VLC not #if

Browse Source
This commit is contained in:
craig.p.drummond
2014-08-21 17:12:13 +00:00
parent c018ad81ea
commit c15b528735
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mpd/httpstream.cpp
View File

@@ -53,7 +53,7 @@ void HttpStream::setEnabled(bool e)
disconnect(MPDConnection::self(), SIGNAL(streamUrl(QString)), this, SLOT(streamUrl(QString)));
disconnect(MPDStatus::self(), SIGNAL(updated()), this, SLOT(updateStatus()));
if (player) {
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
libvlc_media_player_stop(player);
#else
player->stop();
@@ -66,7 +66,7 @@ void HttpStream::streamUrl(const QString &url)
{
MPDStatus * const status = MPDStatus::self();
static const char *constUrlProperty="url";
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
if (player) {
libvlc_media_player_stop(player);
libvlc_media_player_release(player);
@@ -81,7 +81,7 @@ void HttpStream::streamUrl(const QString &url)
}
#endif
if (!url.isEmpty() && !player) {
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
instance = libvlc_new(0, NULL);
QByteArray byteArrayUrl = url.toUtf8();
media = libvlc_media_new_location(instance, byteArrayUrl.constData());
@@ -103,7 +103,7 @@ void HttpStream::streamUrl(const QString &url)
state=status->state();
switch (status->state()) {
case MPDState_Playing:
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
if(libvlc_media_player_get_state(player)!=libvlc_Playing){
libvlc_media_player_play(player);
}
@@ -119,7 +119,7 @@ void HttpStream::streamUrl(const QString &url)
break;
case MPDState_Inactive:
case MPDState_Stopped:
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
libvlc_media_player_stop(player);
#else
player->stop();
@@ -127,7 +127,7 @@ void HttpStream::streamUrl(const QString &url)
break;
case MPDState_Paused:
if (stopOnPause) {
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
libvlc_media_player_stop(player);
#else
player->stop();

4
mpd/httpstream.h
View File

@@ -26,7 +26,7 @@
#include <QObject>
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
#include <vlc/vlc.h>
#elif QT_VERSION < 0x050000
#include <phonon/mediaobject.h>
@@ -54,7 +54,7 @@ private:
bool stopOnPause;
int state;
#if LIBVLC_FOUND
#ifdef LIBVLC_FOUND
libvlc_instance_t *instance;
libvlc_media_player_t *player;
libvlc_media_t *media;