Commit 1987170a authored by Zaheer Abbas Merali's avatar Zaheer Abbas Merali

Port shout2 plugin

Original commit message from CVS:
2005-05-09  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* PORTED_09:
* configure.ac:
* ext/Makefile.am:
* ext/shout2/Makefile.am:
* ext/shout2/gstshout2.c: (gst_shout2send_get_type),
(gst_shout2send_base_init), (gst_shout2send_class_init),
(gst_shout2send_init), (gst_shout2send_event),
(gst_shout2send_render), (gst_shout2send_set_property),
(gst_shout2send_get_property), (gst_shout2send_setcaps),
(gst_shout2send_change_state):
* ext/shout2/gstshout2.h:

Port shout2 plugin
parent 452593c6
2005-05-09 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* PORTED_09:
* configure.ac:
* ext/Makefile.am:
* ext/shout2/Makefile.am:
* ext/shout2/gstshout2.c: (gst_shout2send_get_type),
(gst_shout2send_base_init), (gst_shout2send_class_init),
(gst_shout2send_init), (gst_shout2send_event),
(gst_shout2send_render), (gst_shout2send_set_property),
(gst_shout2send_get_property), (gst_shout2send_setcaps),
(gst_shout2send_change_state):
* ext/shout2/gstshout2.h:
Port shout2 plugin
2005-05-08 Zeeshan Ali <zeenix@gmail.com>
* configure.ac:
......
......@@ -7,6 +7,7 @@ videofilter (wim)
aalib (wim)
libcaca (zeeshan)
law (wim)
shout2 (zaheer) - not fully tested
osssink is partially done in the threaded branch (wim)
......
......@@ -380,6 +380,20 @@ GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
AC_SUBST(LIBCACA_LIBS)
])
dnl *** shout2 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true)
GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [
PKG_CHECK_MODULES(SHOUT2, shout >= 2.0, [
HAVE_SHOUT2="yes"
AC_SUBST(SHOUT2_CFLAGS)
AC_SUBST(SHOUT2_LIBS)
], [
AM_PATH_SHOUT2(HAVE_SHOUT2="yes", HAVE_SHOUT2="no")
AC_SUBST(SHOUT2_CFLAGS)
AC_SUBST(SHOUT2_LIBS)
])
])
dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [
......@@ -468,6 +482,7 @@ ext/Makefile
ext/aalib/Makefile
ext/libcaca/Makefile
ext/mad/Makefile
ext/shout2/Makefile
ext/sidplay/Makefile
common/Makefile
common/m4/Makefile
......
......@@ -310,11 +310,11 @@ endif
# SHOUT_DIR=
# endif
# if USE_SHOUT2
# SHOUT2_DIR=shout2
# else
# SHOUT2_DIR=
# endif
if USE_SHOUT2
SHOUT2_DIR=shout2
else
SHOUT2_DIR=
endif
if USE_SIDPLAY
SIDPLAY_DIR=sidplay
......@@ -444,6 +444,7 @@ SUBDIRS=\
DIST_SUBDIRS=\
mad \
shout2 \
sidplay \
aalib \
libcaca
......@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstshout2.la
libgstshout2_la_SOURCES = gstshout2.c
libgstshout2_la_CFLAGS = $(SHOUT2_CFLAGS) $(GST_CFLAGS)
libgstshout2_la_LIBADD = $(SHOUT2_LIBS) $(GST_LIBS)
libgstshout2_la_LIBADD = $(SHOUT2_LIBS) $(GST_LIBS) $(GST_BASE_LIBS)
libgstshout2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstshout2.h
This diff is collapsed.
......@@ -22,6 +22,7 @@
#define __GST_SHOUT2SEND_H__
#include <gst/gst.h>
#include <gst/base/gstbasesink.h>
#include <shout/shout.h>
#ifdef __cplusplus
......@@ -39,9 +40,7 @@ typedef enum {
/* Definition of structure storing data for this element. */
typedef struct _GstShout2send GstShout2send;
struct _GstShout2send {
GstElement element;
GstPad *sinkpad,*srcpad;
GstBaseSink parent;
GstShout2SendProtocol protocol;
......@@ -50,7 +49,7 @@ struct _GstShout2send {
gchar *ip;
guint port;
gchar *password;
gchar *name;
gchar *streamname;
gchar *description;
gchar *genre;
gchar *mount;
......@@ -71,7 +70,7 @@ struct _GstShout2send {
/* Standard definition defining a class for this element. */
typedef struct _GstShout2sendClass GstShout2sendClass;
struct _GstShout2sendClass {
GstElementClass parent_class;
GstBaseSinkClass parent_class;
/* signal callbacks */
void (*connection_problem) (GstElement *element,guint errno);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment