From 853d104a610a252558b3c34a16d8d9ee9e5e06c6 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 25 Jul 2018 12:57:20 +0900 Subject: Rename libqtsoundmanager for consistency Rename libqtsoundmanager for consistency Change-Id: Id0b36cc54eebe204d9186a6cc5fbd39fdbca47fd Signed-off-by: Kazumasa Mitsunari --- src/libqtsoundmanager.cpp | 179 ++++++++++++++++++++++++++++++++++++++++++++++ src/libqtsoundmanager.h | 60 ++++++++++++++++ src/qlibsoundmanager.cpp | 179 ---------------------------------------------- src/qlibsoundmanager.h | 60 ---------------- src/src.pro | 8 +-- 5 files changed, 243 insertions(+), 243 deletions(-) create mode 100644 src/libqtsoundmanager.cpp create mode 100644 src/libqtsoundmanager.h delete mode 100644 src/qlibsoundmanager.cpp delete mode 100644 src/qlibsoundmanager.h (limited to 'src') diff --git a/src/libqtsoundmanager.cpp b/src/libqtsoundmanager.cpp new file mode 100644 index 0000000..d431f88 --- /dev/null +++ b/src/libqtsoundmanager.cpp @@ -0,0 +1,179 @@ +/* + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "libqtsoundmanager.h" +#include +using namespace std; + +static int create_json_object(const QJsonObject& obj, struct json_object* jobj); +static bool put_val_to_jobj(const char* key, const QJsonValue& val, struct json_object* jobj); +QSoundmanager* me; + +static void cbEvent_static(const std::string& event, struct json_object* event_contents) +{ + const QString event_name = QString(event.c_str()); + QString str = QString(json_object_get_string(event_contents)); + QJsonParseError error; + QJsonDocument jdoc = QJsonDocument::fromJson(str.toUtf8(), &error); + const QJsonObject jobj = jdoc.object(); + emit me->event(event_name, jobj); +} + +static void cbReply_static(struct json_object* replyContents) +{ + if(me == nullptr){ + return; + } + QString str = QString(json_object_get_string(replyContents)); + QJsonParseError error; + QJsonDocument jdoc = QJsonDocument::fromJson(str.toUtf8(), &error); + QJsonObject jobj = jdoc.object(); + emit me->reply(jobj); +} + +QSoundmanager::QSoundmanager(QObject *parent) : + QObject(parent) +{ +} + +QSoundmanager::~QSoundmanager() +{ +} + +int QSoundmanager::init(int port, const QString& token) +{ + string ctoken = token.toStdString(); + int rc = Soundmanager::init(port, ctoken); + if(rc != 0){ + return rc; + } + me = this; + + Soundmanager::registerCallback( + cbEvent_static, + cbReply_static); + return rc; +} + +int QSoundmanager::call(const QString &verb, const QJsonObject &arg) +{ + // translate QJsonObject to struct json_object + struct json_object* jobj = json_object_new_object(); + int ret = create_json_object(arg, jobj); + if(ret < 0) + { + return -1; + } + return Soundmanager::call(verb.toStdString().c_str(), jobj); +} + +int QSoundmanager::connect(int sourceID, const QString& sinkName){ + string str = sinkName.toStdString(); + return Soundmanager::connect(sourceID, str); +} + +int QSoundmanager::connect(int sourceID, int sinkID){ + return Soundmanager::connect(sourceID, sinkID); +} + +int QSoundmanager::disconnect(int connectionID){ + return Soundmanager::disconnect(connectionID); +} +int QSoundmanager::ackSetSourceState(int handle, int errorcode){ + return Soundmanager::ackSetSourceState(handle, errorcode); +} +int QSoundmanager::registerSource(const QString& audio_role){ + string str = audio_role.toStdString(); + return Soundmanager::registerSource(str); +} +int QSoundmanager::getListMainSources(){ + return Soundmanager::getListMainSources(); +} +int QSoundmanager::getListMainSinks(){ + return Soundmanager::getListMainSinks(); +} +int QSoundmanager::getListMainConnections(){ + return Soundmanager::getListMainConnections(); +} +int QSoundmanager::streamOpen(const QString& audio_role, int endpoint_id){ + string arole = audio_role.toStdString(); + return Soundmanager::streamOpen(arole, endpoint_id); +} +int QSoundmanager::streamOpen(const QString& audio_role, const QString& endpoint_id){ + string arole = audio_role.toStdString(); + string eid = endpoint_id.toStdString(); + return Soundmanager::streamOpen(arole, eid); +} + +int QSoundmanager::streamClose(int stream_id){ + return Soundmanager::streamClose(stream_id); +} +int QSoundmanager::setStreamState(int stream_id, int mute){ + return Soundmanager::setStreamState(stream_id, mute); +} + + +static int create_json_object(const QJsonObject& obj, struct json_object* jobj) +{ + try{ + for(auto itr = obj.begin(); itr != obj.end();++itr) + { + string key = itr.key().toStdString(); + //const char* key = itr.key().toStdString().c_str(); // Do not code like this. string is removed if size is over 16!! + + bool ret = put_val_to_jobj(key.c_str(), itr.value(),jobj); + if(!ret){ + /*This is not implemented*/ + qDebug("JsonArray can't parse for now"); + return -1; + } + } + } + catch(...){ + qDebug("Json parse error occured"); + return -1; + } + return 0; +} + +static bool put_val_to_jobj(const char* key, const QJsonValue& val, struct json_object* jobj) +{ + if(val.isArray()){ + return false; // FIXME: Array can't input + } + if(val.isString()){ + string value = val.toString().toStdString(); + json_object_object_add(jobj, key, json_object_new_string(value.c_str())); + } + else{ + const int value = val.toInt(); + json_object_object_add(jobj, key, json_object_new_int(value)); + } + return true; +} + + +void QSoundmanager::subscribe(const QString event_name) +{ + std::string str = event_name.toStdString(); + Soundmanager::subscribe(str); +} + +void QSoundmanager::unsubscribe(const QString event_name) +{ + std::string str = event_name.toStdString(); + Soundmanager::unsubscribe(str); +} diff --git a/src/libqtsoundmanager.h b/src/libqtsoundmanager.h new file mode 100644 index 0000000..1aaff5e --- /dev/null +++ b/src/libqtsoundmanager.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef LIBQTSOUNDMANAGER_H +#define LIBQTSOUNDMANAGER_H + + #include + #include + #include + #include + #include + #include + +// Note: This wrapper library will be integrated to libqtappfw + +class QSoundmanager : public QObject, Soundmanager +{ + Q_OBJECT +public: // method + explicit QSoundmanager(QObject *parent = nullptr); + ~QSoundmanager(); + int init(int port, const QString& token); + void subscribe(const QString event_name); + void unsubscribe(const QString event_name); + +public: + + Q_INVOKABLE int call(const QString &verb, const QJsonObject &arg); + Q_INVOKABLE int connect(int sourceID, const QString& sinkName = "default"); + Q_INVOKABLE int connect(int sourceID, int sinkID); + Q_INVOKABLE int disconnect(int connectionID); + Q_INVOKABLE int ackSetSourceState(int handle, int errorcode); + Q_INVOKABLE int registerSource(const QString& audio_role); + Q_INVOKABLE int getListMainSinks(); + Q_INVOKABLE int getListMainSources(); + Q_INVOKABLE int getListMainConnections(); + Q_INVOKABLE int streamOpen(const QString& audio_role, int endpoint_id); + Q_INVOKABLE int streamOpen(const QString& audio_role, const QString& endpoint_id = "default"); + Q_INVOKABLE int streamClose(int stream_id); + Q_INVOKABLE int setStreamState(int stream_id, int mute = 0); // 0 is unmute , 1 is mute + +signals: + void reply(const QVariant &msg); + void event(const QVariant &event, const QVariant &msg); +}; + + +#endif /*LIBQTSOUNDMANAGER_H*/ diff --git a/src/qlibsoundmanager.cpp b/src/qlibsoundmanager.cpp deleted file mode 100644 index af910fe..0000000 --- a/src/qlibsoundmanager.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright (c) 2017 TOYOTA MOTOR CORPORATION - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "qlibsoundmanager.h" -#include -using namespace std; - -static int create_json_object(const QJsonObject& obj, struct json_object* jobj); -static bool put_val_to_jobj(const char* key, const QJsonValue& val, struct json_object* jobj); -QSoundmanager* me; - -static void cbEvent_static(const std::string& event, struct json_object* event_contents) -{ - const QString event_name = QString(event.c_str()); - QString str = QString(json_object_get_string(event_contents)); - QJsonParseError error; - QJsonDocument jdoc = QJsonDocument::fromJson(str.toUtf8(), &error); - const QJsonObject jobj = jdoc.object(); - emit me->event(event_name, jobj); -} - -static void cbReply_static(struct json_object* replyContents) -{ - if(me == nullptr){ - return; - } - QString str = QString(json_object_get_string(replyContents)); - QJsonParseError error; - QJsonDocument jdoc = QJsonDocument::fromJson(str.toUtf8(), &error); - QJsonObject jobj = jdoc.object(); - emit me->reply(jobj); -} - -QSoundmanager::QSoundmanager(QObject *parent) : - QObject(parent) -{ -} - -QSoundmanager::~QSoundmanager() -{ -} - -int QSoundmanager::init(int port, const QString& token) -{ - string ctoken = token.toStdString(); - int rc = Soundmanager::init(port, ctoken); - if(rc != 0){ - return rc; - } - me = this; - - Soundmanager::registerCallback( - cbEvent_static, - cbReply_static); - return rc; -} - -int QSoundmanager::call(const QString &verb, const QJsonObject &arg) -{ - // translate QJsonObject to struct json_object - struct json_object* jobj = json_object_new_object(); - int ret = create_json_object(arg, jobj); - if(ret < 0) - { - return -1; - } - return Soundmanager::call(verb.toStdString().c_str(), jobj); -} - -int QSoundmanager::connect(int sourceID, const QString& sinkName){ - string str = sinkName.toStdString(); - return Soundmanager::connect(sourceID, str); -} - -int QSoundmanager::connect(int sourceID, int sinkID){ - return Soundmanager::connect(sourceID, sinkID); -} - -int QSoundmanager::disconnect(int connectionID){ - return Soundmanager::disconnect(connectionID); -} -int QSoundmanager::ackSetSourceState(int handle, int errorcode){ - return Soundmanager::ackSetSourceState(handle, errorcode); -} -int QSoundmanager::registerSource(const QString& audio_role){ - string str = audio_role.toStdString(); - return Soundmanager::registerSource(str); -} -int QSoundmanager::getListMainSources(){ - return Soundmanager::getListMainSources(); -} -int QSoundmanager::getListMainSinks(){ - return Soundmanager::getListMainSinks(); -} -int QSoundmanager::getListMainConnections(){ - return Soundmanager::getListMainConnections(); -} -int QSoundmanager::streamOpen(const QString& audio_role, int endpoint_id){ - string arole = audio_role.toStdString(); - return Soundmanager::streamOpen(arole, endpoint_id); -} -int QSoundmanager::streamOpen(const QString& audio_role, const QString& endpoint_id){ - string arole = audio_role.toStdString(); - string eid = endpoint_id.toStdString(); - return Soundmanager::streamOpen(arole, eid); -} - -int QSoundmanager::streamClose(int stream_id){ - return Soundmanager::streamClose(stream_id); -} -int QSoundmanager::setStreamState(int stream_id, int mute){ - return Soundmanager::setStreamState(stream_id, mute); -} - - -static int create_json_object(const QJsonObject& obj, struct json_object* jobj) -{ - try{ - for(auto itr = obj.begin(); itr != obj.end();++itr) - { - string key = itr.key().toStdString(); - //const char* key = itr.key().toStdString().c_str(); // Do not code like this. string is removed if size is over 16!! - - bool ret = put_val_to_jobj(key.c_str(), itr.value(),jobj); - if(!ret){ - /*This is not implemented*/ - qDebug("JsonArray can't parse for now"); - return -1; - } - } - } - catch(...){ - qDebug("Json parse error occured"); - return -1; - } - return 0; -} - -static bool put_val_to_jobj(const char* key, const QJsonValue& val, struct json_object* jobj) -{ - if(val.isArray()){ - return false; // FIXME: Array can't input - } - if(val.isString()){ - string value = val.toString().toStdString(); - json_object_object_add(jobj, key, json_object_new_string(value.c_str())); - } - else{ - const int value = val.toInt(); - json_object_object_add(jobj, key, json_object_new_int(value)); - } - return true; -} - - -void QSoundmanager::subscribe(const QString event_name) -{ - std::string str = event_name.toStdString(); - Soundmanager::subscribe(str); -} - -void QSoundmanager::unsubscribe(const QString event_name) -{ - std::string str = event_name.toStdString(); - Soundmanager::unsubscribe(str); -} diff --git a/src/qlibsoundmanager.h b/src/qlibsoundmanager.h deleted file mode 100644 index bbe3da9..0000000 --- a/src/qlibsoundmanager.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017 TOYOTA MOTOR CORPORATION - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef QLIBSOUNDMANAGER_H -#define QLIBSOUNDMANAGER_H - - #include - #include - #include - #include - #include - #include - -// Note: This wrapper library will be integrated to libqtappfw - -class QSoundmanager : public QObject, Soundmanager -{ - Q_OBJECT -public: // method - explicit QSoundmanager(QObject *parent = nullptr); - ~QSoundmanager(); - int init(int port, const QString& token); - void subscribe(const QString event_name); - void unsubscribe(const QString event_name); - -public: - - Q_INVOKABLE int call(const QString &verb, const QJsonObject &arg); - Q_INVOKABLE int connect(int sourceID, const QString& sinkName = "default"); - Q_INVOKABLE int connect(int sourceID, int sinkID); - Q_INVOKABLE int disconnect(int connectionID); - Q_INVOKABLE int ackSetSourceState(int handle, int errorcode); - Q_INVOKABLE int registerSource(const QString& audio_role); - Q_INVOKABLE int getListMainSinks(); - Q_INVOKABLE int getListMainSources(); - Q_INVOKABLE int getListMainConnections(); - Q_INVOKABLE int streamOpen(const QString& audio_role, int endpoint_id); - Q_INVOKABLE int streamOpen(const QString& audio_role, const QString& endpoint_id = "default"); - Q_INVOKABLE int streamClose(int stream_id); - Q_INVOKABLE int setStreamState(int stream_id, int mute = 0); // 0 is unmute , 1 is mute - -signals: - void reply(const QVariant &msg); - void event(const QVariant &event, const QVariant &msg); -}; - - -#endif /*QLIBSOUNDMANAGER_H*/ diff --git a/src/src.pro b/src/src.pro index 1256a0d..ebd9b9a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -17,11 +17,11 @@ TEMPLATE = lib VERSION = 0.1.0 TARGET = qtsoundmanager -HEADERS = qlibsoundmanager.h -SOURCES = qlibsoundmanager.cpp +HEADERS = libqtsoundmanager.h +SOURCES = libqtsoundmanager.cpp headers.path = /usr/include -headers.files = qlibsoundmanager.h +headers.files = libqtsoundmanager.h target.path = /usr/lib @@ -29,7 +29,7 @@ CONFIG += link_pkgconfig create_pc create_prl no_install_prl PKGCONFIG += soundmanager -QMAKE_PKGCONFIG_NAME = qlibsoundmanager +QMAKE_PKGCONFIG_NAME = libqtsoundmanager QMAKE_PKGCONFIG_FILE = $${QMAKE_PKGCONFIG_NAME} QMAKE_PKGCONFIG_VERSION = $${VERSION} QMAKE_PKGCONFIG_DESCRIPTION = A wrapper interface for libsoundmanager for Qt -- cgit 1.2.3-korg