[Telepathy-commits] [telepathy-gabble/master] rename gabble-media-stream.h to media-stream.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:15 PDT 2008
20080714115820-c9803-849df37880f87f24356333f7e6f1be9ed5f89314.gz
---
src/Makefile.am | 2 +-
src/gabble-media-channel.c | 2 +-
src/gabble-media-session.c | 2 +-
src/gabble-media-stream.c | 2 +-
src/gabble-media-stream.h | 144 --------------------------------------------
src/media-session.h | 2 +-
src/media-stream.h | 144 ++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 149 insertions(+), 149 deletions(-)
delete mode 100644 src/gabble-media-stream.h
create mode 100644 src/media-stream.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 647cfa0..6ce9dd3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,7 +61,7 @@ libgabble_convenience_la_our_sources = \
gabble-media-channel.c \
media-session.h \
gabble-media-session.c \
- gabble-media-stream.h \
+ media-stream.h \
gabble-media-stream.c \
gabble-register.c \
gabble-register.h \
diff --git a/src/gabble-media-channel.c b/src/gabble-media-channel.c
index 07630ba..8bb71d8 100644
--- a/src/gabble-media-channel.c
+++ b/src/gabble-media-channel.c
@@ -41,7 +41,7 @@
#include <telepathy-glib/svc-properties-interface.h>
#include "media-session.h"
-#include "gabble-media-stream.h"
+#include "media-stream.h"
#include "media-factory.h"
diff --git a/src/gabble-media-session.c b/src/gabble-media-session.c
index 7eaa366..e20303c 100644
--- a/src/gabble-media-session.c
+++ b/src/gabble-media-session.c
@@ -40,7 +40,7 @@
#include "connection.h"
#include "media-channel.h"
-#include "gabble-media-stream.h"
+#include "media-stream.h"
#include "presence-cache.h"
#include "presence.h"
diff --git a/src/gabble-media-stream.c b/src/gabble-media-stream.c
index 650338c..11353b1 100644
--- a/src/gabble-media-stream.c
+++ b/src/gabble-media-stream.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-media-stream.h"
+#include "media-stream.h"
#include <dbus/dbus-glib.h>
#include <stdio.h>
diff --git a/src/gabble-media-stream.h b/src/gabble-media-stream.h
deleted file mode 100644
index af0540b..0000000
--- a/src/gabble-media-stream.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * gabble-media-stream.h - Header for GabbleMediaStream
- * Copyright (C) 2006 Collabora Ltd.
- * Copyright (C) 2006 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __GABBLE_MEDIA_STREAM_H__
-#define __GABBLE_MEDIA_STREAM_H__
-
-#include <glib-object.h>
-#include <loudmouth/loudmouth.h>
-
-#include "gabble-types.h"
-#include <telepathy-glib/enums.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
- STREAM_SIG_STATE_NEW,
- STREAM_SIG_STATE_SENT,
- STREAM_SIG_STATE_ACKNOWLEDGED,
- STREAM_SIG_STATE_REMOVING
-} StreamSignallingState;
-
-typedef guint32 CombinedStreamDirection;
-
-typedef struct _GabbleMediaStream GabbleMediaStream;
-typedef struct _GabbleMediaStreamClass GabbleMediaStreamClass;
-
-struct _GabbleMediaStreamClass {
- GObjectClass parent_class;
-};
-
-struct _GabbleMediaStream {
- GObject parent;
-
- gchar *name;
-
- JingleInitiator initiator;
- TpMediaStreamState connection_state;
- StreamSignallingState signalling_state;
-
- CombinedStreamDirection combined_direction;
- gboolean got_local_codecs;
- gboolean playing;
-
- gpointer priv;
-};
-
-GType gabble_media_stream_get_type (void);
-
-/* TYPE MACROS */
-#define GABBLE_TYPE_MEDIA_STREAM \
- (gabble_media_stream_get_type ())
-#define GABBLE_MEDIA_STREAM(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_STREAM, \
- GabbleMediaStream))
-#define GABBLE_MEDIA_STREAM_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_STREAM, \
- GabbleMediaStreamClass))
-#define GABBLE_IS_MEDIA_STREAM(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MEDIA_STREAM))
-#define GABBLE_IS_MEDIA_STREAM_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MEDIA_STREAM))
-#define GABBLE_MEDIA_STREAM_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_STREAM, \
- GabbleMediaStreamClass))
-
-#define GABBLE_TP_TYPE_TRANSPORT_STRUCT (dbus_g_type_get_struct ("GValueArray", \
- G_TYPE_UINT, \
- G_TYPE_STRING, \
- G_TYPE_UINT, \
- G_TYPE_UINT, \
- G_TYPE_STRING, \
- G_TYPE_STRING, \
- G_TYPE_DOUBLE, \
- G_TYPE_UINT, \
- G_TYPE_STRING, \
- G_TYPE_STRING, \
- G_TYPE_INVALID))
-#define GABBLE_TP_TYPE_TRANSPORT_LIST (dbus_g_type_get_collection ("GPtrArray", \
- GABBLE_TP_TYPE_TRANSPORT_STRUCT))
-#define GABBLE_TP_TYPE_CANDIDATE_STRUCT (dbus_g_type_get_struct ("GValueArray", \
- G_TYPE_STRING, \
- GABBLE_TP_TYPE_TRANSPORT_LIST, \
- G_TYPE_INVALID))
-#define GABBLE_TP_TYPE_CANDIDATE_LIST (dbus_g_type_get_collection ("GPtrArray", \
- GABBLE_TP_TYPE_CANDIDATE_STRUCT))
-
-#define GABBLE_TP_TYPE_CODEC_STRUCT (dbus_g_type_get_struct ("GValueArray", \
- G_TYPE_UINT, \
- G_TYPE_STRING, \
- G_TYPE_UINT, \
- G_TYPE_UINT, \
- G_TYPE_UINT, \
- DBUS_TYPE_G_STRING_STRING_HASHTABLE, \
- G_TYPE_INVALID))
-#define GABBLE_TP_TYPE_CODEC_LIST (dbus_g_type_get_collection ("GPtrArray", \
- GABBLE_TP_TYPE_CODEC_STRUCT))
-
-#define COMBINED_DIRECTION_GET_DIRECTION(d) \
- ((TpMediaStreamDirection) ((d) & TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL))
-#define COMBINED_DIRECTION_GET_PENDING_SEND(d) \
- ((TpMediaStreamPendingSend) ((d) >> 2))
-#define MAKE_COMBINED_DIRECTION(d, p) \
- ((CombinedStreamDirection) ((d) | ((p) << 2)))
-
-gboolean gabble_media_stream_error (GabbleMediaStream *self, guint errno,
- const gchar *message, GError **error);
-
-void _gabble_media_stream_close (GabbleMediaStream *close);
-gboolean _gabble_media_stream_post_remote_codecs (GabbleMediaStream *stream,
- LmMessage *message, LmMessageNode *desc_node, GError **error);
-gboolean _gabble_media_stream_post_remote_candidates (
- GabbleMediaStream *stream, LmMessage *message,
- LmMessageNode *transport_node, GError **error);
-LmMessageNode *_gabble_media_stream_add_content_node (
- GabbleMediaStream *stream, LmMessageNode *session_node);
-void _gabble_media_stream_content_node_add_description (
- GabbleMediaStream *stream, LmMessageNode *content_node);
-LmMessageNode *_gabble_media_stream_content_node_add_transport (
- GabbleMediaStream *stream, LmMessageNode *content_node);
-void _gabble_media_stream_update_sending (GabbleMediaStream *stream,
- gboolean start_sending);
-void gabble_media_stream_hold (GabbleMediaStream *stream, gboolean hold);
-
-G_END_DECLS
-
-#endif /* #ifndef __GABBLE_MEDIA_STREAM_H__*/
diff --git a/src/media-session.h b/src/media-session.h
index d9070a5..6094e3e 100644
--- a/src/media-session.h
+++ b/src/media-session.h
@@ -25,7 +25,7 @@
#include <loudmouth/loudmouth.h>
#include "gabble-types.h"
-#include "gabble-media-stream.h"
+#include "media-stream.h"
#include <telepathy-glib/enums.h>
G_BEGIN_DECLS
diff --git a/src/media-stream.h b/src/media-stream.h
new file mode 100644
index 0000000..af0540b
--- /dev/null
+++ b/src/media-stream.h
@@ -0,0 +1,144 @@
+/*
+ * gabble-media-stream.h - Header for GabbleMediaStream
+ * Copyright (C) 2006 Collabora Ltd.
+ * Copyright (C) 2006 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __GABBLE_MEDIA_STREAM_H__
+#define __GABBLE_MEDIA_STREAM_H__
+
+#include <glib-object.h>
+#include <loudmouth/loudmouth.h>
+
+#include "gabble-types.h"
+#include <telepathy-glib/enums.h>
+
+G_BEGIN_DECLS
+
+typedef enum
+{
+ STREAM_SIG_STATE_NEW,
+ STREAM_SIG_STATE_SENT,
+ STREAM_SIG_STATE_ACKNOWLEDGED,
+ STREAM_SIG_STATE_REMOVING
+} StreamSignallingState;
+
+typedef guint32 CombinedStreamDirection;
+
+typedef struct _GabbleMediaStream GabbleMediaStream;
+typedef struct _GabbleMediaStreamClass GabbleMediaStreamClass;
+
+struct _GabbleMediaStreamClass {
+ GObjectClass parent_class;
+};
+
+struct _GabbleMediaStream {
+ GObject parent;
+
+ gchar *name;
+
+ JingleInitiator initiator;
+ TpMediaStreamState connection_state;
+ StreamSignallingState signalling_state;
+
+ CombinedStreamDirection combined_direction;
+ gboolean got_local_codecs;
+ gboolean playing;
+
+ gpointer priv;
+};
+
+GType gabble_media_stream_get_type (void);
+
+/* TYPE MACROS */
+#define GABBLE_TYPE_MEDIA_STREAM \
+ (gabble_media_stream_get_type ())
+#define GABBLE_MEDIA_STREAM(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_STREAM, \
+ GabbleMediaStream))
+#define GABBLE_MEDIA_STREAM_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_STREAM, \
+ GabbleMediaStreamClass))
+#define GABBLE_IS_MEDIA_STREAM(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MEDIA_STREAM))
+#define GABBLE_IS_MEDIA_STREAM_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MEDIA_STREAM))
+#define GABBLE_MEDIA_STREAM_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_STREAM, \
+ GabbleMediaStreamClass))
+
+#define GABBLE_TP_TYPE_TRANSPORT_STRUCT (dbus_g_type_get_struct ("GValueArray", \
+ G_TYPE_UINT, \
+ G_TYPE_STRING, \
+ G_TYPE_UINT, \
+ G_TYPE_UINT, \
+ G_TYPE_STRING, \
+ G_TYPE_STRING, \
+ G_TYPE_DOUBLE, \
+ G_TYPE_UINT, \
+ G_TYPE_STRING, \
+ G_TYPE_STRING, \
+ G_TYPE_INVALID))
+#define GABBLE_TP_TYPE_TRANSPORT_LIST (dbus_g_type_get_collection ("GPtrArray", \
+ GABBLE_TP_TYPE_TRANSPORT_STRUCT))
+#define GABBLE_TP_TYPE_CANDIDATE_STRUCT (dbus_g_type_get_struct ("GValueArray", \
+ G_TYPE_STRING, \
+ GABBLE_TP_TYPE_TRANSPORT_LIST, \
+ G_TYPE_INVALID))
+#define GABBLE_TP_TYPE_CANDIDATE_LIST (dbus_g_type_get_collection ("GPtrArray", \
+ GABBLE_TP_TYPE_CANDIDATE_STRUCT))
+
+#define GABBLE_TP_TYPE_CODEC_STRUCT (dbus_g_type_get_struct ("GValueArray", \
+ G_TYPE_UINT, \
+ G_TYPE_STRING, \
+ G_TYPE_UINT, \
+ G_TYPE_UINT, \
+ G_TYPE_UINT, \
+ DBUS_TYPE_G_STRING_STRING_HASHTABLE, \
+ G_TYPE_INVALID))
+#define GABBLE_TP_TYPE_CODEC_LIST (dbus_g_type_get_collection ("GPtrArray", \
+ GABBLE_TP_TYPE_CODEC_STRUCT))
+
+#define COMBINED_DIRECTION_GET_DIRECTION(d) \
+ ((TpMediaStreamDirection) ((d) & TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL))
+#define COMBINED_DIRECTION_GET_PENDING_SEND(d) \
+ ((TpMediaStreamPendingSend) ((d) >> 2))
+#define MAKE_COMBINED_DIRECTION(d, p) \
+ ((CombinedStreamDirection) ((d) | ((p) << 2)))
+
+gboolean gabble_media_stream_error (GabbleMediaStream *self, guint errno,
+ const gchar *message, GError **error);
+
+void _gabble_media_stream_close (GabbleMediaStream *close);
+gboolean _gabble_media_stream_post_remote_codecs (GabbleMediaStream *stream,
+ LmMessage *message, LmMessageNode *desc_node, GError **error);
+gboolean _gabble_media_stream_post_remote_candidates (
+ GabbleMediaStream *stream, LmMessage *message,
+ LmMessageNode *transport_node, GError **error);
+LmMessageNode *_gabble_media_stream_add_content_node (
+ GabbleMediaStream *stream, LmMessageNode *session_node);
+void _gabble_media_stream_content_node_add_description (
+ GabbleMediaStream *stream, LmMessageNode *content_node);
+LmMessageNode *_gabble_media_stream_content_node_add_transport (
+ GabbleMediaStream *stream, LmMessageNode *content_node);
+void _gabble_media_stream_update_sending (GabbleMediaStream *stream,
+ gboolean start_sending);
+void gabble_media_stream_hold (GabbleMediaStream *stream, gboolean hold);
+
+G_END_DECLS
+
+#endif /* #ifndef __GABBLE_MEDIA_STREAM_H__*/
--
1.5.6.3
More information about the Telepathy-commits
mailing list