summaryrefslogtreecommitdiffstats
path: root/libmpv
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-03-13 10:45:17 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-03-15 23:13:53 -0700
commit8163b8d390a97fdedb1419c921ec89eee3c31b7e (patch)
treeb80e969bca12565696602a2c876efe8c08d5dd73 /libmpv
parent569383bc54cc2c7e0367614e811773c6bff7244e (diff)
downloadmpv-8163b8d390a97fdedb1419c921ec89eee3c31b7e.tar.bz2
mpv-8163b8d390a97fdedb1419c921ec89eee3c31b7e.tar.xz
client API: deprecate qthelper.hpp
It's a WTF that we have something as specific in the API. It could be argued that we should provide helpers for other language and GUI toolkit combinations. Obviously that's not going to scale, and it's somewhat likely that it will bitrot. The rest is said in the API changelog.
Diffstat (limited to 'libmpv')
-rw-r--r--libmpv/qthelper.hpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/libmpv/qthelper.hpp b/libmpv/qthelper.hpp
index bc30dec8a5..3af86e36e7 100644
--- a/libmpv/qthelper.hpp
+++ b/libmpv/qthelper.hpp
@@ -13,6 +13,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef MPV_CLIENT_API_QTHELPER_H_
+#define MPV_CLIENT_API_QTHELPER_H_
+
+#include <mpv/client.h>
+
+#if !MPV_ENABLE_DEPRECATED
+#error "This helper is deprecated. Copy it into your project instead."
+#else
+
/**
* Note: these helpers are provided for convenience for C++/Qt applications.
* This is based on the public API in client.h, and it does not encode any
@@ -21,9 +30,6 @@
* for other languages.
*/
-#ifndef MPV_CLIENT_API_QTHELPER_H_
-#define MPV_CLIENT_API_QTHELPER_H_
-
#include <cstring>
#include <QVariant>
@@ -33,8 +39,6 @@
#include <QSharedPointer>
#include <QMetaType>
-#include <mpv/client.h>
-
namespace mpv {
namespace qt {
@@ -377,4 +381,6 @@ static inline QVariant command(mpv_handle *ctx, const QVariant &args)
Q_DECLARE_METATYPE(mpv::qt::ErrorReturn)
+#endif /* else #if MPV_ENABLE_DEPRECATED */
+
#endif