diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-28 20:05:43 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-02 00:19:40 +0800 |
| commit | 57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb (patch) | |
| tree | d56fd559d83d857238b7c66a94254b3aeacc70fe /src | |
| parent | 758b4250e767d9e952b8c0ea4db7d93df192a0c0 (diff) | |
| download | gsoc2013-empathy-57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb.tar gsoc2013-empathy-57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb.tar.gz gsoc2013-empathy-57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb.tar.bz2 gsoc2013-empathy-57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb.tar.lz gsoc2013-empathy-57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb.tar.xz gsoc2013-empathy-57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb.tar.zst gsoc2013-empathy-57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb.zip | |
Allow to build with empathy-av
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/empathy-streamed-media-handler.c | 6 | ||||
| -rw-r--r-- | src/empathy-streamed-media-handler.h | 2 | ||||
| -rw-r--r-- | src/empathy-streamed-media-window.c | 8 |
4 files changed, 14 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ffc74e7fd..ba482c176 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,7 @@ bin_PROGRAMS = \ libexec_PROGRAMS = \ empathy-auth-client \ - empathy-av \ + empathy-call \ empathy-chat empathy_accounts_SOURCES = \ @@ -69,6 +69,7 @@ empathy_debugger_SOURCES = \ empathy-debugger.c \ $(NULL) +if HAVE_EMPATHY_AV empathy_av_SOURCES = \ empathy-av.c \ empathy-audio-sink.c \ @@ -96,6 +97,10 @@ empathy_av_SOURCES = \ empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS) empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS) $(LIBM) +libexec_PROGRAMS += empathy-av + +endif + empathy_auth_client_SOURCES = \ empathy-auth-client.c \ $(NULL) @@ -109,8 +114,6 @@ empathy_chat_SOURCES = \ gedit-close-button.c gedit-close-button.h \ $(NULL) -libexec_PROGRAMS += empathy-call - empathy_call_SOURCES = \ empathy-call.c \ empathy-call-factory.c \ diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c index a3c539773..42d991b9d 100644 --- a/src/empathy-streamed-media-handler.c +++ b/src/empathy-streamed-media-handler.c @@ -539,7 +539,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler return; if (s != NULL && - gst_structure_has_name (s, "farsight-send-codec-changed")) + gst_structure_has_name (s, "farstream-send-codec-changed")) { const GValue *val; FsCodec *codec; @@ -554,7 +554,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler update_sending_codec (handler, codec, session); } else if (s != NULL && - gst_structure_has_name (s, "farsight-recv-codecs-changed")) + gst_structure_has_name (s, "farstream-recv-codecs-changed")) { const GValue *val; GList *codecs; @@ -569,7 +569,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler update_receiving_codec (handler, codecs, stream); } else if (s != NULL && - gst_structure_has_name (s, "farsight-new-active-candidate-pair")) + gst_structure_has_name (s, "farstream-new-active-candidate-pair")) { const GValue *val; FsCandidate *remote_candidate, *local_candidate; diff --git a/src/empathy-streamed-media-handler.h b/src/empathy-streamed-media-handler.h index ab655b8e4..429c95447 100644 --- a/src/empathy-streamed-media-handler.h +++ b/src/empathy-streamed-media-handler.h @@ -24,7 +24,7 @@ #include <glib-object.h> #include <gst/gst.h> -#include <gst/farsight/fs-conference-iface.h> +#include <farstream/fs-conference.h> #include <libempathy/empathy-tp-streamed-media.h> #include <libempathy/empathy-contact.h> diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index df3fbab00..beec4ebae 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -31,11 +31,11 @@ #include <glib/gi18n.h> #include <telepathy-glib/util.h> -#include <telepathy-farsight/channel.h> -#include <telepathy-glib/util.h> -#include <gst/farsight/fs-element-added-notifier.h> -#include <gst/farsight/fs-utils.h> +#include <telepathy-farsight/stream.h> + +#include <farstream/fs-element-added-notifier.h> +#include <farstream/fs-utils.h> #include <libempathy/empathy-tp-contact-factory.h> #include <libempathy/empathy-utils.h> |