diff options
author | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-06-06 20:36:49 +0900 |
---|---|---|
committer | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-06-28 15:16:58 +0900 |
commit | dd45065c7556a4dfe8a0fe340a6093bcb84e772a (patch) | |
tree | 8dd6b6714b9ae3443d20ad1ba95b3e9f85172bb3 | |
parent | de22d2c202af9a4074a1d2e120b971488eac649a (diff) |
Add new APIsneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.0jellyfish_9.99.4jellyfish_9.99.3jellyfish_9.99.2jellyfish_9.99.1jellyfish/9.99.4jellyfish/9.99.3jellyfish/9.99.2jellyfish/9.99.1icefish_8.99.5icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish_8.99.1icefish/8.99.5icefish/8.99.4icefish/8.99.3icefish/8.99.2icefish/8.99.1halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut_7.99.2halibut_7.99.1halibut_7.90.0halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.3halibut/7.99.2halibut/7.99.1halibut/7.90.0guppy_6.99.4guppy_6.99.3guppy_6.99.2guppy_6.99.1guppy_6.90.0guppy/6.99.4guppy/6.99.3guppy/6.99.2guppy/6.99.1guppy/6.90.0flounder_5.99.6flounder_5.99.5flounder_5.99.4flounder_5.99.3flounder_5.99.2flounder_5.99.1flounder/5.99.6flounder/5.99.5flounder/5.99.4flounder/5.99.3flounder/5.99.2flounder/5.99.19.99.49.99.39.99.29.99.18.99.58.99.48.99.38.99.28.99.18.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.37.99.27.99.17.90.06.99.46.99.36.99.26.99.16.90.05.99.65.99.55.99.45.99.35.99.25.99.113.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0halibut
High level API
* stream_open
* stream_close
* set_stream_state
Get functions
* getListMainSinks
* getListMainSources
* getListMainConnections
New event
* stream_state_event
Change-Id: Ifdfd4551d64bbc83a080bb4d9d07f77e7b5715a8
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
-rw-r--r-- | src/qlibsoundmanager.cpp | 30 | ||||
-rw-r--r-- | src/qlibsoundmanager.h | 11 |
2 files changed, 37 insertions, 4 deletions
diff --git a/src/qlibsoundmanager.cpp b/src/qlibsoundmanager.cpp index c9e002c..a7722d9 100644 --- a/src/qlibsoundmanager.cpp +++ b/src/qlibsoundmanager.cpp @@ -95,10 +95,36 @@ int QSoundmanager::disconnect(int connectionID){ int QSoundmanager::ackSetSourceState(int handle, int errorcode){ return Soundmanager::ackSetSourceState(handle, errorcode); } -int QSoundmanager::registerSource(const QString& name){ - string str = name.toStdString(); +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::stream_open(const QString& audio_role, int endpoint_id){ + string arole = audio_role.toStdString(); + return Soundmanager::stream_open(arole, endpoint_id); +} +int QSoundmanager::stream_open(const QString& audio_role, const QString& endpoint_id){ + string arole = audio_role.toStdString(); + string eid = endpoint_id.toStdString(); + return Soundmanager::stream_open(arole, eid); +} + +int QSoundmanager::stream_close(int stream_id){ + return Soundmanager::stream_close(stream_id); +} +int QSoundmanager::set_stream_state(int stream_id, int mute){ + return Soundmanager::set_stream_state(stream_id, mute); +} + static int create_json_object(const QJsonObject& obj, struct json_object* jobj) { diff --git a/src/qlibsoundmanager.h b/src/qlibsoundmanager.h index 36b477b..4c17002 100644 --- a/src/qlibsoundmanager.h +++ b/src/qlibsoundmanager.h @@ -38,11 +38,18 @@ public: // method public: Q_INVOKABLE int call(const QString &verb, const QJsonObject &arg); - Q_INVOKABLE int connect(int sourceID, const QString& sinkName); + 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& name); + Q_INVOKABLE int registerSource(const QString& audio_role); + Q_INVOKABLE int getListMainSinks(); + Q_INVOKABLE int getListMainSources(); + Q_INVOKABLE int getListMainConnections(); + Q_INVOKABLE int stream_open(const QString& audio_role, int endpoint_id); + Q_INVOKABLE int stream_open(const QString& audio_role, const QString& endpoint_id = "default"); + Q_INVOKABLE int stream_close(int stream_id); + Q_INVOKABLE int set_stream_state(int stream_id, int mute = 0); // 0 is unmute , 1 is mute signals: void reply(const QVariant &msg); |