]> www.infradead.org Git - pidgin-chime.git/commitdiff
Merge branch 'audio'.
authorDavid Woodhouse <dwmw@amazon.co.uk>
Thu, 22 Feb 2018 09:20:01 +0000 (09:20 +0000)
committerDavid Woodhouse <dwmw@amazon.co.uk>
Thu, 22 Feb 2018 09:20:01 +0000 (09:20 +0000)
I've been using it for every call I've made this week. There are still a
few things to be cleaned up, but I suppose I should concede it's time it
was merged into the master branch for others to test and heckle.

This ought to now work with the Ubuntu 16.04 packages of GStreamer,
FarStream, etc.

1  2 
chat.c
chime-call.h

diff --cc chat.c
index 33e97d7e116251aa1ec3dbc8542a3f1c83c06a08,d11845e01db0b97e79359f5d7aa23a17173073e0..f7a468830f93ef9ebb52f2746622988422c47c33
--- 1/chat.c
--- 2/chat.c
+++ b/chat.c
  #include <debug.h>
  #include <media.h>
  #include <mediamanager.h>
+ #include <media-gst.h>
  
  #include "chime.h"
 -#include "chime-connection-private.h"
  #include "chime-room.h"
  #include "chime-meeting.h"
  
diff --cc chime-call.h
index 9fb37f6ceb7d197fc6b6ec7193f5e55e8b8df3b5,ab4e4806736e00bced3c60844caa1ffc58cd5e0d..d976b4ffe00e0e36ed84045237f79b254451e402
@@@ -84,8 -93,18 +93,22 @@@ GList *chime_call_get_participants(Chim
  struct _ChimeCallAudio;
  typedef struct _ChimeCallAudio ChimeCallAudio;
  
++
 +void chime_call_emit_participants(ChimeCall *call);
 +
+ typedef enum {
+       CHIME_AUDIO_STATE_CONNECTING = 0,
+       CHIME_AUDIO_STATE_FAILED,
+       CHIME_AUDIO_STATE_AUDIOLESS,
+       CHIME_AUDIO_STATE_AUDIO,
+       CHIME_AUDIO_STATE_AUDIO_MUTED,
+       CHIME_AUDIO_STATE_HANGUP,
+       CHIME_AUDIO_STATE_DISCONNECTED,
+ } ChimeAudioState;
+ void chime_call_install_gst_app_callbacks(ChimeCall *call, GstAppSrc *appsrc, GstAppSink *appsink);
++
  G_END_DECLS
  
  #endif /* __CHIME_CALL_H__ */