From kde-multimedia  Wed Jun 20 15:05:30 2012
From: Harald Sitter <sitter () kde ! org>
Date: Wed, 20 Jun 2012 15:05:30 +0000
To: kde-multimedia
Subject: [phonon-vlc] src: AudioDataOutput works fine with VLC 2.1 again (activate it in Backend)
Message-Id: <20120620150530.5D5C5A60A9 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-multimedia&m=134020496511242

Git commit da7a06d906a1211d77eef401769f6e96869d9740 by Harald Sitter.
Committed on 20/06/2012 at 17:05.
Pushed by sitter into branch 'master'.

AudioDataOutput works fine with VLC 2.1 again (activate it in Backend)

If anyone has VLC 2.0.1 or better yet VLC 2.0 git, please feel free to
remove the #if and test if it works for you. It will probably be a while
until VLC 2.1 gets out, so if we get a 2.0 release that fixes the issue
it would be preferable.

CCMAIL: kde-multimedia@kde.org

M  +1    -1    src/backend.cpp

http://commits.kde.org/phonon-vlc/da7a06d906a1211d77eef401769f6e96869d9740

diff --git a/src/backend.cpp b/src/backend.cpp
index 8a1d33a..bca35c7 100644
--- a/src/backend.cpp
+++ b/src/backend.cpp
@@ -133,7 +133,7 @@ QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const
 #ifdef __GNUC__
 #warning VLC 2.0 broke sout/transcode/smem -> ADO
 #endif
-#if (LIBVLC_VERSION_INT < LIBVLC_VERSION(2, 0, 0, 0))
+#if (LIBVLC_VERSION_INT < LIBVLC_VERSION(2, 0, 0, 0)) || (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 1, 0, 0))
     case AudioDataOutputClass:
         return new AudioDataOutput(parent);
 #endif
_______________________________________________
kde-multimedia mailing list
kde-multimedia@kde.org
https://mail.kde.org/mailman/listinfo/kde-multimedia