Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.

svn path=/trunk/; revision=632

1 files changed, 59 insertions, 57 deletions

diff --git a/libempathy/empathy-tp-call.h b/libempathy/empathy-tp-call.h
index 13ab33fcb..69f873425 100644
--- a/libempathy/empathy-tp-call.h
+++ b/libempathy/empathy-tp-call.h
@@ -1,88 +1,90 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2007 Elliot Fairweather
- * Copyright (C) 2007 Collabora Ltd.
+ *  Copyright (C) 2007 Elliot Fairweather
  *
- * 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 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.
+ *  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
+ *  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
  *
- * Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
- *          Xavier Claessens <xclaesse@gmail.com>
+ *  Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
  */
 
 #ifndef __EMPATHY_TP_CALL_H__
 #define __EMPATHY_TP_CALL_H__
 
 #include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-constants.h>
+#include <libtelepathy/tp-conn.h>
 
-#include <libmissioncontrol/mc-account.h>
+#include <libmissioncontrol/mission-control.h>
 
-#include "empathy-contact.h"
+#include <libempathy/empathy-chandler.h>
+#include <libempathy/empathy-contact.h>
+#include <libempathy/empathy-tp-group.h>
 
 G_BEGIN_DECLS
 
-#define EMPATHY_TYPE_TP_CALL              (empathy_tp_call_get_type ())
-#define EMPATHY_TP_CALL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), EMPATHY_TYPE_TP_CALL, EmpathyTpCall))
-#define EMPATHY_TP_CALL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
-#define EMPATHY_IS_TP_CALL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), EMPATHY_TYPE_TP_CALL))
-#define EMPATHY_IS_TP_CALL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_TP_CALL))
-#define EMPATHY_TP_CALL_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
+#define EMPATHY_TYPE_TP_CALL (empathy_tp_call_get_type ())
+#define EMPATHY_TP_CALL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), \
+    EMPATHY_TYPE_TP_CALL, EmpathyTpCall))
+#define EMPATHY_TP_CALL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
+    EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
+#define EMPATHY_IS_TP_CALL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), \
+    EMPATHY_TYPE_TP_CALL))
+#define EMPATHY_IS_TP_CALL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+    EMPATHY_TYPE_TP_CALL))
+#define EMPATHY_TP_CALL_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), \
+    EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
 
 typedef struct _EmpathyTpCall EmpathyTpCall;
 typedef struct _EmpathyTpCallClass EmpathyTpCallClass;
 
 struct _EmpathyTpCall {
-	GObject parent;
+    GObject parent;
 };
 
 struct _EmpathyTpCallClass {
-	GObjectClass parent_class;
+    GObjectClass parent_class;
 };
 
-typedef enum {
-	EMPATHY_TP_CALL_STATUS_PREPARING,
-	EMPATHY_TP_CALL_STATUS_RINGING,
-	EMPATHY_TP_CALL_STATUS_RUNNING
+typedef enum
+{
+  EMPATHY_TP_CALL_STATUS_READYING,
+  EMPATHY_TP_CALL_STATUS_PENDING,
+  EMPATHY_TP_CALL_STATUS_ACCEPTED,
+  EMPATHY_TP_CALL_STATUS_CLOSED
 } EmpathyTpCallStatus;
 
-GType               empathy_tp_call_get_type              (void) G_GNUC_CONST;
-EmpathyTpCall *     empathy_tp_call_new                   (McAccount      *account,
-							   TpChan         *tp_chan);
-gboolean            empathy_tp_call_is_incoming           (EmpathyTpCall  *call);
-EmpathyTpCallStatus empathy_tp_call_get_status            (EmpathyTpCall  *call);
-EmpathyContact *    empathy_tp_call_get_contact           (EmpathyTpCall  *call);
-void                empathy_tp_call_accept                (EmpathyTpCall  *call);
-void                empathy_tp_call_invite                (EmpathyTpCall  *call,
-							   EmpathyContact *contact);
-void                empathy_tp_call_request_streams       (EmpathyTpCall  *call,
-							   gboolean        audio,
-							   gboolean        video);
-void                empathy_tp_call_send_video            (EmpathyTpCall  *call,
-							   gboolean        send);
-void                empathy_tp_call_add_preview_window    (EmpathyTpCall  *call,
-							   guint           socket_id);
-void                empathy_tp_call_remove_preview_window (EmpathyTpCall  *call,
-							   guint           socket_id);
-void                empathy_tp_call_set_output_window     (EmpathyTpCall  *call,
-							   guint           socket_id);
-void                empathy_tp_call_set_output_volume     (EmpathyTpCall  *call,
-							   guint           volume);
-void                empathy_tp_call_mute_output           (EmpathyTpCall  *call,
-							   gboolean        is_muted);
-void                empathy_tp_call_mute_input            (EmpathyTpCall  *call,
-							   gboolean        is_muted);
+typedef struct
+{
+  gboolean exists;
+  guint id;
+  guint state;
+  guint direction;
+} EmpathyTpCallStream;
+
+GType empathy_tp_call_get_type (void) G_GNUC_CONST;
+EmpathyTpCall *empathy_tp_call_new (TpConn *connection, TpChan *channel);
+
+void empathy_tp_call_accept_incoming_call (EmpathyTpCall *call);
+void empathy_tp_call_close_channel (EmpathyTpCall *call);
+void empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,
+    gboolean is_sending);
+void empathy_tp_call_add_preview_video (guint preview_video_socket_id);
+void empathy_tp_call_remove_preview_video (guint preview_video_socket_id);
+void empathy_tp_call_add_output_video (EmpathyTpCall *call,
+    guint output_video_socket_id);
+void empathy_tp_call_set_output_volume (EmpathyTpCall *call, guint volume);
+void empathy_tp_call_mute_output (EmpathyTpCall *call, gboolean is_muted);
+void empathy_tp_call_mute_input (EmpathyTpCall *call, gboolean is_muted);
 
 G_END_DECLS