summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libplayback-wrapper.cpp12
-rw-r--r--src/resource.cpp68
2 files changed, 73 insertions, 7 deletions
diff --git a/src/libplayback-wrapper.cpp b/src/libplayback-wrapper.cpp
index a869b63..940945d 100644
--- a/src/libplayback-wrapper.cpp
+++ b/src/libplayback-wrapper.cpp
@@ -6,6 +6,7 @@ static inline quint16 resourceFlagsToLibPlaybackFlags(quint16 resourceFlags);
static inline enum ResourceState libPlaybackStateToResourceState(enum pb_state_e libPlaybackState);
static void libPlaybackStateHandler(pb_playback_t *libPlaybackHandler, enum pb_state_e newState,
pb_req_t* playbackRequest, void *data);
+static void libPlaybackStateHintHandler(pb_playback_t *libPlaybackHandler, const int allowedStates[], void *data);
LibPlaybackWrapper::LibPlaybackWrapper(Resource *res)
: QObject(res), dbusConnection(NULL), libPlaybackHandle(NULL)
@@ -108,12 +109,10 @@ void libPlaybackStateHandler(pb_playback_t *libPlaybackHandler, enum pb_state_e
{
LibPlaybackWrapper *libPlaybackWrapper = static_cast<LibPlaybackWrapper*>(data);
- libPlaybackWrapper->stateChanged(newState);
-
pb_playback_req_completed(libPlaybackHandler, playbackRequest);
+ libPlaybackWrapper->stateChanged(newState);
}
-
void LibPlaybackWrapper::stateChanged(enum pb_state_e newState)
{
enum ResourceState resourceState;
@@ -133,3 +132,10 @@ inline enum ResourceState libPlaybackStateToResourceState(enum pb_state_e libPla
return UnknownState;
}
}
+
+static void libPlaybackStateHintHandler(pb_playback_t *libPlaybackHandler, const int allowedStates[], void *data)
+{
+ LibPlaybackWrapper *libPlaybackWrapper = static_cast<LibPlaybackWrapper*>(data);
+
+// libPlaybackWrapper->hintReceived(newStates);
+}
diff --git a/src/resource.cpp b/src/resource.cpp
index 1765c04..3b461da 100644
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -40,7 +40,7 @@ bool Resource::hasResource(enum ResourceType resourceType) const
return false;
}
-bool Resource::hasExclusiveAccess() const
+bool Resource::isReserved() const
{
if(resourceState == OwnedState)
return true;
@@ -60,17 +60,77 @@ void Resource::handleStateChange(enum ResourceState newState)
}
}
-bool Resource::requestExclusiveAccess()
+void Resource::emitReservable()
+{
+ return;
+}
+
+bool Resource::reserve()
{
return false;
}
-bool Resource::releaseExclusiveAccess()
+bool Resource::release()
+{
+ return false;
+}
+
+bool Resource::requestState()
+{
+ return false;
+}
+
+bool Resource::setMute()
+{
+ return false;
+}
+
+bool Resource::unsetMute()
+{
+ return false;
+}
+
+bool Resource::requestMute()
+{
+ return false;
+}
+
+bool Resource::setPrivacyOverride()
+{
+ return false;
+}
+
+bool Resource::unsetPrivacyOverride()
+{
+ return false;
+}
+
+bool Resource::requestPrivacyOverride()
+{
+ return false;
+}
+
+bool Resource::setBluetoothOverride()
+{
+ return false;
+}
+
+bool Resource::unsetBluetoothOverride()
+{
+ return false;
+}
+
+bool Resource::requestBluetoothOverride()
+{
+ return false;
+}
+
+bool Resource::setPid(quint32 pid)
{
return false;
}
-bool Resource::getExclusiveAccessState()
+bool Resource::setStreamName(const QString & name)
{
return false;
}