From 9284f0d2684f299b8e76550be2d8b889d266d2d2 Mon Sep 17 00:00:00 2001
From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Fri, 12 Jan 2018 18:50:03 +0900
Subject: Align libsoundmanager
libsoundmanager changes the name of class and pkgconfig.
So fix the build error of the class name.
Change-Id: I3d3a5bf2d9007913049846a3f72876dd33f82548
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---
src/qlibsoundmanager.cpp | 4 ++--
src/qlibsoundmanager.h | 2 +-
src/src.pro | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/qlibsoundmanager.cpp b/src/qlibsoundmanager.cpp
index 13e0a3f..98d6043 100644
--- a/src/qlibsoundmanager.cpp
+++ b/src/qlibsoundmanager.cpp
@@ -47,7 +47,7 @@ static void cbReply_static(struct json_object* replyContents)
QLibSoundmanager::QLibSoundmanager(QObject *parent) :
QObject(parent)
{
- libsm = new LibSoundmanager();
+ libsm = new Soundmanager();
}
QLibSoundmanager::~QLibSoundmanager()
@@ -67,7 +67,7 @@ int QLibSoundmanager::init(int port, const QString& token)
}
me = this;
- libsm->register_callback(
+ libsm->registerCallback(
cbEvent_static,
cbReply_static);
return rc;
diff --git a/src/qlibsoundmanager.h b/src/qlibsoundmanager.h
index 523173c..6ce5b46 100644
--- a/src/qlibsoundmanager.h
+++ b/src/qlibsoundmanager.h
@@ -49,7 +49,7 @@ signals:
void event(const QVariant &event, const QVariant &msg);
private:
- LibSoundmanager* libsm;
+ Soundmanager* libsm;
};
diff --git a/src/src.pro b/src/src.pro
index b2726fe..1256a0d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -15,7 +15,7 @@
TEMPLATE = lib
VERSION = 0.1.0
-TARGET = qtSoundmanagerWrapper
+TARGET = qtsoundmanager
HEADERS = qlibsoundmanager.h
SOURCES = qlibsoundmanager.cpp
@@ -27,7 +27,7 @@ target.path = /usr/lib
CONFIG += link_pkgconfig create_pc create_prl no_install_prl
-PKGCONFIG += libsoundmanager
+PKGCONFIG += soundmanager
QMAKE_PKGCONFIG_NAME = qlibsoundmanager
QMAKE_PKGCONFIG_FILE = $${QMAKE_PKGCONFIG_NAME}
@@ -35,7 +35,7 @@ QMAKE_PKGCONFIG_VERSION = $${VERSION}
QMAKE_PKGCONFIG_DESCRIPTION = A wrapper interface for libsoundmanager for Qt
QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib
QMAKE_PKGCONFIG_INCDIR = ${prefix}/include
-QMAKE_PKGCONFIG_REQUIRES = libsoundmanager
+QMAKE_PKGCONFIG_REQUIRES = soundmanager
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
INSTALLS += target headers
--
cgit