[Player-cvs] common/gtk/pub hxmarshal.h, NONE, 1.1 hxbasicplayback.h, 1.1, 1.2 hxdbusplayer.h, 1.1, 1.2 hxplayer.h, 1.19, 1.20 hxstatisticsobserver.h, 1.4, 1.5
rggammon at helixcommunity.org rggammon at helixcommunity.orgUpdate of /cvsroot/player/common/gtk/pub
In directory cvs:/tmp/cvs-serv4196/pub
Modified Files:
hxbasicplayback.h hxdbusplayer.h hxplayer.h
hxstatisticsobserver.h
Added Files:
hxmarshal.h
Log Message:
Updating for ume.
Index: hxdbusplayer.h
===================================================================
RCS file: /cvsroot/player/common/gtk/pub/hxdbusplayer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hxdbusplayer.h 21 May 2005 01:59:33 -0000 1.1
+++ hxdbusplayer.h 6 Jul 2005 00:10:07 -0000 1.2
@@ -69,23 +69,23 @@
struct _HXDBusPlayer
{
- GtkSocket socket;
-
+ GObject obj;
+
DBusGConnection *connection;
DBusGProxy *backend_driver;
DBusGProxy *player_driver;
+
+ GtkWidget* socket;
+
};
struct _HXDBusPlayerClass
{
- GtkSocketClass parent_class;
+ GObjectClass parent_class;
};
-GtkWidget* hx_dbus_player_new (void);
-
-void hx_dbus_player_show_controls (gboolean show);
-gboolean hx_dbus_player_controls_visible (void);
+HXDBusPlayer* hx_dbus_player_new (const gchar* backend_path);
G_END_DECLS
Index: hxplayer.h
===================================================================
RCS file: /cvsroot/player/common/gtk/pub/hxplayer.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- hxplayer.h 21 May 2005 01:59:33 -0000 1.19
+++ hxplayer.h 6 Jul 2005 00:10:07 -0000 1.20
@@ -82,6 +82,9 @@
struct _SHXClientWindow;
typedef struct _SHXClientWindow SHXClientWindow;
+struct _HXStatisticsObserver;
+typedef struct _HXStatisticsObserver HXStatisticsObserver;
+
/* These enumeration values correspond to the values in HXClientConstants.
Don't change them! */
typedef enum
@@ -126,11 +129,16 @@
guint cur_loop;
gboolean is_seeking;
+
+ // Observers for basic clip meta info
+ HXStatisticsObserver* title_observer;
+ HXStatisticsObserver* author_observer;
+ HXStatisticsObserver* copyright_observer;
};
struct _HXPlayerClass
{
- GtkWidgetClass parent_class;
+ GObjectClass parent_class;
void (* contacting) (HXPlayer* player,
gchar* text);
--- NEW FILE: hxmarshal.h ---
#ifndef __g_cclosure_user_marshal_MARSHAL_H__
#define __g_cclosure_user_marshal_MARSHAL_H__
#include <glib-object.h>
G_BEGIN_DECLS
/* VOID:STRING,STRING,BOOLEAN (/dev/stdin:1) */
extern void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:STRING,POINTER,BOOLEAN (/dev/stdin:2) */
extern void g_cclosure_user_marshal_VOID__STRING_POINTER_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT64 (/dev/stdin:3) */
extern void g_cclosure_user_marshal_VOID__INT64 (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:UINT,UINT (/dev/stdin:4) */
extern void g_cclosure_user_marshal_VOID__UINT_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:STRING,STRING (/dev/stdin:5) */
extern void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT (/dev/stdin:6) */
extern void g_cclosure_user_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:STRING,POINTER (/dev/stdin:7) */
extern void g_cclosure_user_marshal_VOID__STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:BOXED,UINT (/dev/stdin:8) */
extern void g_cclosure_user_marshal_VOID__BOXED_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:UINT,POINTER (/dev/stdin:9) */
#define g_cclosure_user_marshal_VOID__UINT_POINTER g_cclosure_marshal_VOID__UINT_POINTER
/* BOOLEAN:STRING (/dev/stdin:10) */
extern void g_cclosure_user_marshal_BOOLEAN__STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:UINT,UINT,STRING,STRING,STRING (/dev/stdin:11) */
extern void g_cclosure_user_marshal_VOID__UINT_UINT_STRING_STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
G_END_DECLS
#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */
Index: hxbasicplayback.h
===================================================================
RCS file: /cvsroot/player/common/gtk/pub/hxbasicplayback.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hxbasicplayback.h 21 May 2005 01:59:33 -0000 1.1
+++ hxbasicplayback.h 6 Jul 2005 00:10:07 -0000 1.2
@@ -88,6 +88,7 @@
void (* play_signal) (HXBasicPlayback* playback);
void (* pause_signal) (HXBasicPlayback* playback);
void (* stop_signal) (HXBasicPlayback* playback);
+ void (* state_changed_signal) (HXBasicPlayback* playback);
void (* end_of_clip_signal) (HXBasicPlayback* playback);
void (* seek_start_signal) (HXBasicPlayback* playback);
void (* seek_stop_signal) (HXBasicPlayback* playback);
@@ -103,16 +104,14 @@
void (* length_changed_signal) (HXBasicPlayback* player,
gint64 length);
- void (* current_clip_basic_metadata_changed_signal) (HXBasicPlayback* player,
- HXBasicMetadataType type,
- GValue* value);
+ void (* current_clip_basic_metadata_changed_signal) (HXBasicPlayback* player);
- void (* ideal_visual_content_size_changed) (HXBasicPlayback* player,
- guint width,
- guint height);
+ void (* ideal_visual_content_size_changed_signal) (HXBasicPlayback* player,
+ guint width,
+ guint height);
- void (* visual_state_changed) (HXBasicPlayback* player,
- gboolean is_visible);
+ void (* visual_state_changed_signal) (HXBasicPlayback* player,
+ gboolean is_visible);
/* functions */
@@ -163,6 +162,8 @@
gint* width,
gint* height);
gboolean (* has_visual_content)(HXBasicPlayback* player);
+
+ void (* destroy) (HXBasicPlayback* player);
};
GtkType hx_basic_playback_get_type (void);
@@ -199,7 +200,7 @@
gint64 hx_basic_playback_get_length (HXBasicPlayback* playback);
gint64 hx_basic_playback_get_position (HXBasicPlayback* playback);
gboolean hx_basic_playback_is_live (HXBasicPlayback* player);
-gboolean hx_basic_playback_is_indefinite_duration (HXBasicPlayback* player);
+gboolean hx_basic_playback_is_infinite_duration (HXBasicPlayback* player);
gboolean hx_basic_playback_can_set_volume (HXBasicPlayback* playback);
gboolean hx_basic_playback_can_set_mute (HXBasicPlayback* playback);
Index: hxstatisticsobserver.h
===================================================================
RCS file: /cvsroot/player/common/gtk/pub/hxstatisticsobserver.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hxstatisticsobserver.h 9 Jul 2004 18:24:05 -0000 1.4
+++ hxstatisticsobserver.h 6 Jul 2005 00:10:07 -0000 1.5
@@ -54,9 +54,7 @@
#include "hxplayer.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define HX_TYPE_STATISTICS_OBSERVER (hx_statistics_observer_get_type ())
#define HX_STATISTICS_OBSERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HX_TYPE_STATISTICS_OBSERVER, HXStatisticsObserver))
@@ -90,9 +88,6 @@
HXStatisticsObserver* hx_statistics_observer_new (HXPlayer* player,
const gchar* name);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
#endif