Commit 182fb022 authored by Olivier Crête's avatar Olivier Crête 👻

Remove MSN plugin

parent 11dde55c
......@@ -75,7 +75,6 @@ tests/check/rtp/conference
tests/check/rtp/codecs
tests/check/rtp/sendcodecs
tests/check/rtp/recvcodecs
tests/check/msn/conference
tests/check/utils/binadded
tests/check/elements/rtcpfilter
tests/check/elements/funnel
......
......@@ -29,9 +29,6 @@ Run time for the RTP plugin:
- gst-plugins-good 1.4.0
- gst-plugins-bad 1.4.0
Run time for the MSN plugin:
- gst-plugins-bad 1.4.0
For the GUI example:
- Gtk 3.0
......
......@@ -113,7 +113,6 @@ dnl these are all the gst plug-ins, compilable without additional libs
FS_PLUGINS_ALL=" \
fsrawconference \
fsrtpconference \
fsmsnconference \
fsvideoanyrate \
fsrtpxdata \
"
......@@ -403,7 +402,6 @@ common-modified/Makefile
gst/Makefile
gst/fsrawconference/Makefile
gst/fsrtpconference/Makefile
gst/fsmsnconference/Makefile
gst/fsvideoanyrate/Makefile
gst/fsrtpxdata/Makefile
farstream/Makefile
......
......@@ -60,7 +60,6 @@ SCANOBJ_DEPS = \
$(top_builddir)/transmitters/nice/libnice-transmitter.la \
$(top_builddir)/transmitters/shm/libshm-transmitter.la \
$(top_builddir)/gst/fsrtpconference/libfsrtpconference_doc.la \
$(top_builddir)/gst/fsmsnconference/libfsmsnconference_doc.la \
$(top_builddir)/gst/fsrawconference/libfsrawconference_doc.la \
$(top_builddir)/gst/fsvideoanyrate/libfsvideoanyrate.la \
$(top_builddir)/gst/fsrtpxdata/libfsrtpxdata.la
......@@ -89,12 +88,6 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/fsrawconference/fs-raw-session.h \
$(top_srcdir)/gst/fsrawconference/fs-raw-stream.h \
$(top_srcdir)/gst/fsrawconference/fs-raw-participant.h \
$(top_srcdir)/gst/fsmsnconference/fs-msn-cam-recv-conference.h \
$(top_srcdir)/gst/fsmsnconference/fs-msn-cam-send-conference.h \
$(top_srcdir)/gst/fsmsnconference/fs-msn-conference.h \
$(top_srcdir)/gst/fsmsnconference/fs-msn-session.h \
$(top_srcdir)/gst/fsmsnconference/fs-msn-stream.h \
$(top_srcdir)/gst/fsmsnconference/fs-msn-participant.h \
$(top_srcdir)/transmitters/rawudp/fs-rawudp-transmitter.h \
$(top_srcdir)/transmitters/rawudp/fs-rawudp-stream-transmitter.h \
$(top_srcdir)/transmitters/multicast/fs-multicast-transmitter.h \
......@@ -130,7 +123,6 @@ GTKDOC_LIBS = \
$(top_builddir)/farstream/libfarstream-@FS_APIVERSION@.la \
$(top_builddir)/gst/fsrtpconference/libfsrtpconference_doc.la \
$(top_builddir)/gst/fsrawconference/libfsrawconference_doc.la \
$(top_builddir)/gst/fsmsnconference/libfsmsnconference_doc.la \
$(GST_BASE_LIBS)
GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
......
......@@ -33,15 +33,6 @@
<xi:include href="xml/fs-raw-session.xml"/>
<xi:include href="xml/fs-raw-stream.xml"/>
</chapter>
<chapter>
<title>MSN Webcam plugin</title>
<xi:include href="xml/element-fsmsncamsendconference.xml"/>
<xi:include href="xml/element-fsmsncamrecvconference.xml"/>
<xi:include href="xml/fs-msn-conference.xml"/>
<xi:include href="xml/fs-msn-participant.xml"/>
<xi:include href="xml/fs-msn-session.xml"/>
<xi:include href="xml/fs-msn-stream.xml"/>
</chapter>
</part>
<part>
......
......@@ -331,121 +331,6 @@ FS_SHM_STREAM_TRANSMITTER_GET_CLASS
</SECTION>
<SECTION>
<FILE>fs-msn-conference</FILE>
<TITLE>FsMsnConference</TITLE>
FsMsnConference
<SUBSECTION Standard>
FS_MSN_CONFERENCE_CAST
FsMsnConferencePrivate
FsMsnConferenceClass
FS_MSN_CONFERENCE
FS_IS_MSN_CONFERENCE
FS_TYPE_MSN_CONFERENCE
fs_msn_conference_get_type
FS_MSN_CONFERENCE_CLASS
FS_IS_MSN_CONFERENCE_CLASS
FS_MSN_CONFERENCE_GET_CLASS
</SECTION>
<SECTION>
<FILE>fs-msn-session</FILE>
<TITLE>FsMsnSession</TITLE>
FsMsnSession
<SUBSECTION Standard>
FS_IS_MSN_SESSION
FS_IS_MSN_SESSION_CLASS
FS_MSN_SESSION
FS_MSN_SESSION_CAST
FS_MSN_SESSION_CLASS
FS_MSN_SESSION_GET_CLASS
FS_TYPE_MSN_SESSION
FsMsnSessionClass
FsMsnSessionPrivate
fs_msn_session_get_type
<SUBSECTION Private>
fs_msn_session_new
fs_msn_session_new_recv_pad
connection
</SECTION>
<SECTION>
<FILE>fs-msn-stream</FILE>
<TITLE>FsMsnStream</TITLE>
FsMsnStream
<SUBSECTION Standard>
FS_IS_MSN_STREAM
FS_IS_MSN_STREAM_CLASS
FS_MSN_STREAM
FS_MSN_STREAM_CAST
FS_MSN_STREAM_CLASS
FS_MSN_STREAM_GET_CLASS
FS_TYPE_MSN_STREAM
FsMsnStreamClass
FsMsnStreamPrivate
fs_msn_stream_get_type
<SUBSECTION Private>
fs_msn_stream_new
fs_msn_stream_set_tos_locked
</SECTION>
<SECTION>
<FILE>fs-msn-participant</FILE>
<TITLE>FsMsnParticipant</TITLE>
FsMsnParticipant
<SUBSECTION Standard>
FS_IS_MSN_PARTICIPANT
FS_IS_MSN_PARTICIPANT_CLASS
FS_MSN_PARTICIPANT
FS_MSN_PARTICIPANT_CAST
FS_MSN_PARTICIPANT_CLASS
FS_MSN_PARTICIPANT_GET_CLASS
FS_TYPE_MSN_PARTICIPANT
FsMsnParticipantClass
FsMsnParticipantPrivate
fs_msn_participant_get_type
<SUBSECTION Private>
fs_msn_participant_new
</SECTION>
<SECTION>
<FILE>element-fsmsncamrecvconference</FILE>
<TITLE>FsMsnCamCamRecvConference</TITLE>
FsMsnCamRecvConference
<SUBSECTION Private>
FS_IS_MSN_CAM_RECV_CONFERENCE
FS_IS_MSN_CAM_RECV_CONFERENCE_CLASS
FS_MSN_CAM_RECV_CONFERENCE
FS_MSN_CAM_RECV_CONFERENCE_CAST
FS_MSN_CAM_RECV_CONFERENCE_CLASS
FS_MSN_CAM_RECV_CONFERENCE_GET_CLASS
FS_TYPE_MSN_CAM_RECV_CONFERENCE
FsMsnCamRecvConferenceClass
FsMsnCamRecvConferencePrivate
fs_msn_cam_recv_conference_get_type
</SECTION>
<SECTION>
<FILE>element-fsmsncamsendconference</FILE>
<TITLE>FsMsnCamSendConference</TITLE>
FsMsnCamSendConference
<SUBSECTION Private>
FS_IS_MSN_CAM_SEND_CONFERENCE
FS_IS_MSN_CAM_SEND_CONFERENCE_CLASS
FS_MSN_CAM_SEND_CONFERENCE
FS_MSN_CAM_SEND_CONFERENCE_CAST
FS_MSN_CAM_SEND_CONFERENCE_CLASS
FS_MSN_CAM_SEND_CONFERENCE_GET_CLASS
FS_TYPE_MSN_CAM_SEND_CONFERENCE
FsMsnCamSendConferenceClass
FsMsnCamSendConferencePrivate
fs_msn_cam_send_conference_get_type
</SECTION>
<SECTION>
<FILE>element-fsrawconference</FILE>
<TITLE>FsRawConference</TITLE>
......
......@@ -2,10 +2,6 @@
#include "../../gst/fsrtpconference/fs-rtp-participant.h"
#include "../../gst/fsrtpconference/fs-rtp-session.h"
#include "../../gst/fsrtpconference/fs-rtp-stream.h"
#include "../../gst/fsmsnconference/fs-msn-conference.h"
#include "../../gst/fsmsnconference/fs-msn-participant.h"
fs_rtp_participant_get_type
fs_rtp_session_get_type
fs_rtp_stream_get_type
fs_msn_conference_get_type
fs_msn_participant_get_type
plugin_LTLIBRARIES = libfsmsnconference.la
# First build a convenience lib with the common stuff so its not built twice
noinst_LTLIBRARIES = libfsmsnconference-convenience.la
libfsmsnconference_convenience_la_SOURCES = \
fs-msn-cam-recv-conference.c \
fs-msn-cam-send-conference.c \
fs-msn-participant.c \
fs-msn-session.c \
fs-msn-connection.c \
fs-msn-stream.c
noinst_HEADERS = \
fs-msn-cam-recv-conference.h \
fs-msn-cam-send-conference.h \
fs-msn-conference.h \
fs-msn-participant.h \
fs-msn-session.h \
fs-msn-connection.h \
fs-msn-stream.h
AM_CFLAGS = \
$(FS_INTERNAL_CFLAGS) \
$(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(NICE_CFLAGS)
# Build the main plugin
libfsmsnconference_la_SOURCES = \
fs-msn-conference.c
libfsmsnconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsmsnconference_la_LIBTOOLFLAGS = $(PLUGIN_LIBTOOLFLAGS)
libfsmsnconference_la_LIBADD = \
libfsmsnconference-convenience.la \
$(top_builddir)/farstream/libfarstream-@FS_APIVERSION@.la \
$(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
$(NICE_LIBS)
# Optionally build a library to allow building the gtk-doc
if ENABLE_GTK_DOC
noinst_LTLIBRARIES += libfsmsnconference_doc.la
nodist_libfsmsnconference_doc_la_CFLAGS = -DBUILD_GTK_DOC
nodist_libfsmsnconference_doc_la_SOURCES = $(libfsmsnconference_la_SOURCES)
libfsmsnconference_doc_la_LIBADD = libfsmsnconference-convenience.la \
$(libfsmsnconference_la_LIBADD)
CLEANFILES = $(BUILT_SOURCES)
endif
/*
* Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
* fs-msn-recv-conference.c - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* SECTION:element-fsmsncamrecvconference
* @short_description: Farstream MSN Receive Conference Gstreamer Element
*
* This element implements the unidirection webcam feature found in various
* version of MSN Messenger (tm) and Windows Live Messenger (tm). This is
* to receive someone else's webcam.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "fs-msn-cam-recv-conference.h"
#include "fs-msn-conference.h"
#include "fs-msn-session.h"
#include "fs-msn-stream.h"
#include "fs-msn-participant.h"
#define GST_CAT_DEFAULT fsmsnconference_debug
G_DEFINE_TYPE (FsMsnCamRecvConference, fs_msn_cam_recv_conference,
FS_TYPE_MSN_CONFERENCE);
static void
fs_msn_cam_recv_conference_class_init (FsMsnCamRecvConferenceClass * klass)
{
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
gst_element_class_set_metadata (gstelement_class,
"Farstream MSN Reception Conference",
"Generic/Bin/MSN",
"A Farstream MSN Reception Conference",
"Richard Spiers <richard.spiers@gmail.com>, "
"Youness Alaoui <youness.alaoui@collabora.com>, "
"Olivier Crete <olivier.crete@collabora.com>");
}
static void
fs_msn_cam_recv_conference_init (FsMsnCamRecvConference *self)
{
FsMsnConference *conf = FS_MSN_CONFERENCE (self);
GstElementFactory *fact = NULL;
GST_DEBUG_OBJECT (conf, "fs_msn_cam_recv_conference_init");
conf->max_direction = FS_DIRECTION_RECV;
fact = gst_element_factory_find ("mimenc");
if (fact)
gst_object_unref (fact);
else
g_set_error (&conf->missing_element_error,
FS_ERROR, FS_ERROR_CONSTRUCTION,
"mimenc missing");
}
/*
* Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
* fs-msn-recv-conference.h - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __FS_MSN_CAM_RECV_CONFERENCE_H__
#define __FS_MSN_CAM_RECV_CONFERENCE_H__
#include "fs-msn-conference.h"
G_BEGIN_DECLS
#define FS_TYPE_MSN_CAM_RECV_CONFERENCE (fs_msn_cam_recv_conference_get_type ())
#define FS_MSN_CAM_RECV_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_MSN_CAM_RECV_CONFERENCE, \
FsMsnCamRecvConference))
#define FS_MSN_CAM_RECV_CONFERENCE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), FS_TYPE_MSN_CAM_RECV_CONFERENCE, \
FsMsnCamRecvConferenceClass))
#define FS_MSN_CAM_RECV_CONFERENCE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), FS_TYPE_MSN_CAM_RECV_CONFERENCE, \
FsMsnCamRecvConferenceClass))
#define FS_IS_MSN_CAM_RECV_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), FS_TYPE_MSN_CAM_RECV_CONFERENCE))
#define FS_IS_MSN_CAM_RECV_CONFERENCE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), FS_TYPE_MSN_CAM_RECV_CONFERENCE))
#define FS_MSN_CAM_RECV_CONFERENCE_CAST(obj) \
((FsMsnCamRecvConference *)(obj))
typedef struct _FsMsnCamRecvConference FsMsnCamRecvConference;
typedef struct _FsMsnCamRecvConferenceClass FsMsnCamRecvConferenceClass;
typedef struct _FsMsnCamRecvConferencePrivate FsMsnCamRecvConferencePrivate;
struct _FsMsnCamRecvConference
{
FsMsnConference parent;
};
struct _FsMsnCamRecvConferenceClass
{
FsMsnConferenceClass parent_class;
};
GType fs_msn_cam_recv_conference_get_type (void);
G_END_DECLS
#endif /* __FS_MSN_CAM_RECV_CONFERENCE_H__ */
/*
* Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
* fs-msn-send-conference.c - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* SECTION:element-fsmsncamsendconference
* @short_description: Farstream MSN send Conference Gstreamer Element
*
* This element implements the unidirection webcam feature found in various
* version of MSN Messenger (tm) and Windows Live Messenger (tm). This is
* to send the local webcam's video to someone else.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "fs-msn-cam-send-conference.h"
#include "fs-msn-conference.h"
#include "fs-msn-session.h"
#include "fs-msn-stream.h"
#include "fs-msn-participant.h"
#define GST_CAT_DEFAULT fsmsnconference_debug
G_DEFINE_TYPE (FsMsnCamSendConference, fs_msn_cam_send_conference,
FS_TYPE_MSN_CONFERENCE);
static void
fs_msn_cam_send_conference_class_init (FsMsnCamSendConferenceClass * klass)
{
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
gst_element_class_set_metadata (gstelement_class,
"Farstream MSN Sending Conference",
"Generic/Bin/MSN",
"A Farstream MSN Sending Conference",
"Richard Spiers <richard.spiers@gmail.com>, "
"Youness Alaoui <youness.alaoui@collabora.co.uk>, "
"Olivier Crete <olivier.crete@collabora.co.uk>");
}
static void
fs_msn_cam_send_conference_init (FsMsnCamSendConference *self)
{
FsMsnConference *conf = FS_MSN_CONFERENCE (self);
GstElementFactory *fact = NULL;
GST_DEBUG_OBJECT (conf, "fs_msn_cam_send_conference_init");
conf->max_direction = FS_DIRECTION_SEND;
fact = gst_element_factory_find ("mimenc");
if (fact)
gst_object_unref (fact);
else
g_set_error (&conf->missing_element_error,
FS_ERROR, FS_ERROR_CONSTRUCTION,
"mimenc missing");
}
/*
* Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
* fs-msn-send-conference.h - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __FS_MSN_CAM_SEND_CONFERENCE_H__
#define __FS_MSN_CAM_SEND_CONFERENCE_H__
#include "fs-msn-conference.h"
G_BEGIN_DECLS
#define FS_TYPE_MSN_CAM_SEND_CONFERENCE (fs_msn_cam_send_conference_get_type ())
#define FS_MSN_CAM_SEND_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_MSN_CAM_SEND_CONFERENCE, \
FsMsnCamSendConference))
#define FS_MSN_CAM_SEND_CONFERENCE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), FS_TYPE_MSN_CAM_SEND_CONFERENCE, \
FsMsnCamSendConferenceClass))
#define FS_MSN_CAM_SEND_CONFERENCE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), FS_TYPE_MSN_CAM_SEND_CONFERENCE, \
FsMsnCamSendConferenceClass))
#define FS_IS_MSN_CAM_SEND_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), FS_TYPE_MSN_CAM_SEND_CONFERENCE))
#define FS_IS_MSN_CAM_SEND_CONFERENCE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), FS_TYPE_MSN_CAM_SEND_CONFERENCE))
#define FS_MSN_CAM_SEND_CONFERENCE_CAST(obj) \
((FsMsnCamSendConference *)(obj))
typedef struct _FsMsnCamSendConference FsMsnCamSendConference;
typedef struct _FsMsnCamSendConferenceClass FsMsnCamSendConferenceClass;
typedef struct _FsMsnCamSendConferencePrivate FsMsnCamSendConferencePrivate;
struct _FsMsnCamSendConference
{
FsMsnConference parent;
};
struct _FsMsnCamSendConferenceClass
{
FsMsnConferenceClass parent_class;
};
GType fs_msn_cam_send_conference_get_type (void);
G_END_DECLS
#endif /* __FS_MSN_CAM_SEND_CONFERENCE_H__ */
/*
* Farstream - Farstream MSN Conference Implementation
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
* fs-msn-conference.c - MSN implementation for Farstream Conference Gstreamer
* Elements
*
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* SECTION:fs-msn-conference