Import upstream version 0.4.2

1 files changed, 45 insertions, 71 deletions

diff --git a/src/music-player-bridge.h b/src/music-player-bridge.h
index 64ccb1c..d1a612f 100644
--- a/src/music-player-bridge.h
+++ b/src/music-player-bridge.h
@@ -1,4 +1,4 @@
-/* music-player-bridge.h generated by valac 0.9.7, the Vala compiler, do not modify */
+/* music-player-bridge.h generated by valac 0.9.8, the Vala compiler, do not modify */
 
 
 #ifndef __MUSIC_PLAYER_BRIDGE_H__
@@ -19,10 +19,10 @@
 #include <libdbusmenu-glib/server.h>
 #include <gio/gio.h>
 #include <gee.h>
-#include <float.h>
-#include <math.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
+#include <float.h>
+#include <math.h>
 
 G_BEGIN_DECLS
 
@@ -106,31 +106,19 @@ typedef struct _TitleMenuitemClass TitleMenuitemClass;
 typedef struct _TitleMenuitemPrivate TitleMenuitemPrivate;
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
-#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
-#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
-#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
-#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
-#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
-#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define TYPE_MPRIS2_CONTROLLER (mpris2_controller_get_type ())
+#define MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2Controller))
+#define MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+#define IS_MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS2_CONTROLLER))
+#define IS_MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS2_CONTROLLER))
+#define MPRIS2_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
 
-typedef struct _MprisBridge MprisBridge;
-typedef struct _MprisBridgeClass MprisBridgeClass;
+typedef struct _Mpris2Controller Mpris2Controller;
+typedef struct _Mpris2ControllerClass Mpris2ControllerClass;
 
 #define PLAYER_CONTROLLER_TYPE_WIDGET_ORDER (player_controller_widget_order_get_type ())
 
 #define PLAYER_CONTROLLER_TYPE_STATE (player_controller_state_get_type ())
-typedef struct _MprisBridgePrivate MprisBridgePrivate;
-
-#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
-#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
-#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
-#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
-#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-
-typedef struct _MprisController MprisController;
-typedef struct _MprisControllerClass MprisControllerClass;
-typedef struct _MprisControllerPrivate MprisControllerPrivate;
 
 #define TYPE_MPRIS_ROOT (mpris_root_get_type ())
 #define MPRIS_ROOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_ROOT, MprisRoot))
@@ -155,16 +143,6 @@ typedef struct _MprisPlayerIface MprisPlayerIface;
 
 typedef struct _FreeDesktopProperties FreeDesktopProperties;
 typedef struct _FreeDesktopPropertiesIface FreeDesktopPropertiesIface;
-
-#define TYPE_MPRIS2_CONTROLLER (mpris2_controller_get_type ())
-#define MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2Controller))
-#define MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
-#define IS_MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS2_CONTROLLER))
-#define IS_MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS2_CONTROLLER))
-#define MPRIS2_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
-
-typedef struct _Mpris2Controller Mpris2Controller;
-typedef struct _Mpris2ControllerClass Mpris2ControllerClass;
 typedef struct _Mpris2ControllerPrivate Mpris2ControllerPrivate;
 
 #define TYPE_FAMILIAR_PLAYERS_DB (familiar_players_db_get_type ())
@@ -178,6 +156,17 @@ typedef struct _FamiliarPlayersDB FamiliarPlayersDB;
 typedef struct _FamiliarPlayersDBClass FamiliarPlayersDBClass;
 typedef struct _FamiliarPlayersDBPrivate FamiliarPlayersDBPrivate;
 
+#define TYPE_FETCH_FILE (fetch_file_get_type ())
+#define FETCH_FILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FETCH_FILE, FetchFile))
+#define FETCH_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FETCH_FILE, FetchFileClass))
+#define IS_FETCH_FILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FETCH_FILE))
+#define IS_FETCH_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FETCH_FILE))
+#define FETCH_FILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FETCH_FILE, FetchFileClass))
+
+typedef struct _FetchFile FetchFile;
+typedef struct _FetchFileClass FetchFileClass;
+typedef struct _FetchFilePrivate FetchFilePrivate;
+
 struct _MusicPlayerBridge {
 	GObject parent_instance;
 	MusicPlayerBridgePrivate * priv;
@@ -243,7 +232,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisBridge* mpris_bridge;
+	Mpris2Controller* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -265,24 +254,6 @@ typedef enum  {
 	PLAYER_CONTROLLER_STATE_DISCONNECTED
 } PlayerControllerstate;
 
-struct _MprisBridge {
-	GObject parent_instance;
-	MprisBridgePrivate * priv;
-};
-
-struct _MprisBridgeClass {
-	GObjectClass parent_class;
-};
-
-struct _MprisController {
-	GObject parent_instance;
-	MprisControllerPrivate * priv;
-};
-
-struct _MprisControllerClass {
-	GObjectClass parent_class;
-};
-
 struct _MprisRootIface {
 	GTypeInterface parent_iface;
 	void (*Quit) (MprisRoot* self, GError** error);
@@ -336,6 +307,15 @@ struct _FamiliarPlayersDBClass {
 	GObjectClass parent_class;
 };
 
+struct _FetchFile {
+	GObject parent_instance;
+	FetchFilePrivate * priv;
+};
+
+struct _FetchFileClass {
+	GObjectClass parent_class;
+};
+
 
 GType music_player_bridge_get_type (void) G_GNUC_CONST;
 MusicPlayerBridge* music_player_bridge_new (void);
@@ -357,8 +337,11 @@ TransportMenuitem* transport_menuitem_construct (GType object_type, PlayerContro
 void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
 GeeHashSet* transport_menuitem_attributes_format (void);
 GType metadata_menuitem_get_type (void) G_GNUC_CONST;
+extern char* metadata_menuitem_album_art_cache_dir;
+#define METADATA_MENUITEM_ALBUM_ART_DIR_SUFFIX "indicators/sound/album-art-cache"
 MetadataMenuitem* metadata_menuitem_new (void);
 MetadataMenuitem* metadata_menuitem_construct (GType object_type);
+void metadata_menuitem_fetch_art (MetadataMenuitem* self, const char* uri, const char* prop);
 GeeHashSet* metadata_menuitem_attributes_format (void);
 GType scrub_menuitem_get_type (void) G_GNUC_CONST;
 ScrubMenuitem* scrub_menuitem_new (PlayerController* parent);
@@ -370,7 +353,7 @@ GType title_menuitem_get_type (void) G_GNUC_CONST;
 TitleMenuitem* title_menuitem_new (PlayerController* parent);
 TitleMenuitem* title_menuitem_construct (GType object_type, PlayerController* parent);
 GeeHashSet* title_menuitem_attributes_format (void);
-GType mpris_bridge_get_type (void) G_GNUC_CONST;
+GType mpris2_controller_get_type (void) G_GNUC_CONST;
 GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
 GType player_controller_state_get_type (void) G_GNUC_CONST;
 #define PLAYER_CONTROLLER_WIDGET_QUANTITY 4
@@ -389,21 +372,6 @@ GAppInfo* player_controller_get_app_info (PlayerController* self);
 void player_controller_set_app_info (PlayerController* self, GAppInfo* value);
 gint player_controller_get_menu_offset (PlayerController* self);
 void player_controller_set_menu_offset (PlayerController* self, gint value);
-MprisBridge* mpris_bridge_new (PlayerController* ctrl);
-MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl);
-gboolean mpris_bridge_connected (MprisBridge* self);
-void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
-void mpris_bridge_expose (MprisBridge* self);
-void mpris_bridge_set_track_position (MprisBridge* self, double pos);
-GType mpris_controller_get_type (void) G_GNUC_CONST;
-MprisController* mpris_controller_new (PlayerController* ctrl, const char* inter);
-MprisController* mpris_controller_construct (GType object_type, PlayerController* ctrl, const char* inter);
-void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command);
-void mpris_controller_set_position (MprisController* self, double position);
-gboolean mpris_controller_connected (MprisController* self);
-DBusGProxy* mpris_controller_get_mpris_player (MprisController* self);
-PlayerController* mpris_controller_get_owner (MprisController* self);
-const char* mpris_controller_get_mpris_interface (MprisController* self);
 MprisRoot* mpris_root_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
 GType mpris_root_get_type (void) G_GNUC_CONST;
 void mpris_root_Quit (MprisRoot* self, GError** error);
@@ -433,14 +401,13 @@ char* mpris_player_get_PlaybackStatus (MprisPlayer* self);
 void mpris_player_set_PlaybackStatus (MprisPlayer* self, const char* value);
 GType free_desktop_properties_get_type (void) G_GNUC_CONST;
 FreeDesktopProperties* free_desktop_properties_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
-GType mpris2_controller_get_type (void) G_GNUC_CONST;
 #define MPRIS2_CONTROLLER_root_interface "org.mpris.MediaPlayer2"
 Mpris2Controller* mpris2_controller_new (PlayerController* ctrl);
 Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl);
 void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char* interface_source, GHashTable* changed_properties, char** invalid, int invalid_length1);
 void mpris2_controller_initial_update (Mpris2Controller* self);
-void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command);
-void mpris2_controller_set_position (Mpris2Controller* self, double position);
+void mpris2_controller_transport_update (Mpris2Controller* self, TransportMenuitemaction command);
+void mpris2_controller_set_track_position (Mpris2Controller* self, double position);
 void mpris2_controller_onSeeked (Mpris2Controller* self, gint64 position);
 gboolean mpris2_controller_connected (Mpris2Controller* self);
 gboolean mpris2_controller_was_successfull (Mpris2Controller* self);
@@ -462,6 +429,13 @@ FamiliarPlayersDB* familiar_players_db_construct (GType object_type);
 void familiar_players_db_insert (FamiliarPlayersDB* self, const char* desktop);
 gboolean familiar_players_db_already_familiar (FamiliarPlayersDB* self, const char* desktop);
 GeeSet* familiar_players_db_records (FamiliarPlayersDB* self);
+GType fetch_file_get_type (void) G_GNUC_CONST;
+FetchFile* fetch_file_new (const char* uri, const char* prop);
+FetchFile* fetch_file_construct (GType object_type, const char* uri, const char* prop);
+void fetch_file_fetch_data (FetchFile* self, GAsyncReadyCallback _callback_, gpointer _user_data_);
+void fetch_file_fetch_data_finish (FetchFile* self, GAsyncResult* _res_);
+const char* fetch_file_get_uri (FetchFile* self);
+const char* fetch_file_get_intended_property (FetchFile* self);
 
 
 G_END_DECLS