Renamed things to improive the API and implemented the mandatory State

Changed handler. Added access methods to Resource.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/libplayback-wrapper.h b/src/libplayback-wrapper.h
index be86c7f..103d710 100644
--- a/src/libplayback-wrapper.h
+++ b/src/libplayback-wrapper.h
@@ -1,10 +1,10 @@
+#ifndef LIBPLAYBACKWRAPPER_H
+#define LIBPLAYBACKWRAPPER_H
+
 #include "resource-library.h"
 #include "resource.h"
 #include <libplayback/playback.h>
 
-#ifndef LIBPLAYBACKWRAPPER_H
-#define LIBPLAYBACKWRAPPER_H
-
 class LibPlaybackWrapper: public QObject, public ResourceLibrary
 {
    Q_OBJECT
@@ -13,16 +13,13 @@ private:
    DBusConnection *dbusConnection;
    pb_playback_t *libPlaybackHandle;
    Resource *resource;
+
 public:
    LibPlaybackWrapper(Resource *resource);
    ~LibPlaybackWrapper();
    bool initialize();
    bool connectToServer();
+   void stateChanged(enum pb_state_e newState);
 };
 
-void libPlaybackStateHandler(pb_playback_t *libPlaybackHandle, enum pb_state_e requestedState,
-			     pb_req_t* playbackRequest, void *data);
-
-inline enum pb_class_e resourceClassToLibPlaybackClass(enum ResourceClass resourceClass);
-inline quint16 resourceFlagToLibPlaybackFlags(quint16 resourceFlag);
 #endif