mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/shout2/gstshout2.*: Add a property for username.

Browse source 
Original commit message from CVS:
* ext/shout2/gstshout2.c: (gst_shout2send_class_init),
(gst_shout2send_init), (gst_shout2send_start),
(gst_shout2send_set_property), (gst_shout2send_get_property):
* ext/shout2/gstshout2.h:
Add a property for username.
This commit is contained in:
Michael Smith 2007-02-27 23:43:08 +00:00
parent b9820ee991
commit 570e2ffd10
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-02-28 Michael Smith <msmith@fluendo.com>
* ext/shout2/gstshout2.c: (gst_shout2send_class_init),
(gst_shout2send_init), (gst_shout2send_start),
(gst_shout2send_set_property), (gst_shout2send_get_property):
* ext/shout2/gstshout2.h:
Add a property for username.
2007-02-27 Christian Schallerr <christian@fluendo.com> 2007-02-27 Christian Schallerr <christian@fluendo.com>
* sys/osxaudio: Add Pioneers of the inevitable to the copyright list * sys/osxaudio: Add Pioneers of the inevitable to the copyright list

19
ext/shout2/gstshout2.c
View file

@ -52,6 +52,7 @@ enum
ARG_IP, /* the ip of the server */ ARG_IP, /* the ip of the server */
ARG_PORT, /* the encoder port number on the server */ ARG_PORT, /* the encoder port number on the server */
ARG_PASSWORD, /* the encoder password on the server */ ARG_PASSWORD, /* the encoder password on the server */
ARG_USERNAME, /* the encoder username on the server */
ARG_PUBLIC, /* is this stream public? */ ARG_PUBLIC, /* is this stream public? */
ARG_STREAMNAME, /* Name of the stream */ ARG_STREAMNAME, /* Name of the stream */
ARG_DESCRIPTION, /* Description of the stream */ ARG_DESCRIPTION, /* Description of the stream */
@ -66,6 +67,7 @@ enum
#define DEFAULT_IP "127.0.0.1" #define DEFAULT_IP "127.0.0.1"
#define DEFAULT_PORT 8000 #define DEFAULT_PORT 8000
#define DEFAULT_PASSWORD "hackme" #define DEFAULT_PASSWORD "hackme"
#define DEFAULT_USERNAME "source"
#define DEFAULT_STREAMNAME "" #define DEFAULT_STREAMNAME ""
#define DEFAULT_DESCRIPTION "" #define DEFAULT_DESCRIPTION ""
#define DEFAULT_GENRE "" #define DEFAULT_GENRE ""
@ -193,6 +195,10 @@ gst_shout2send_class_init (GstShout2sendClass * klass)
g_param_spec_string ("password", "password", "password", DEFAULT_PASSWORD, g_param_spec_string ("password", "password", "password", DEFAULT_PASSWORD,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_USERNAME,
g_param_spec_string ("username", "username", "username", DEFAULT_USERNAME,
G_PARAM_READWRITE));
/* metadata */ /* metadata */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_STREAMNAME, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_STREAMNAME,
g_param_spec_string ("streamname", "streamname", "name of the stream", g_param_spec_string ("streamname", "streamname", "name of the stream",
@ -244,6 +250,7 @@ gst_shout2send_init (GstShout2send * shout2send)
shout2send->ip = g_strdup (DEFAULT_IP); shout2send->ip = g_strdup (DEFAULT_IP);
shout2send->port = DEFAULT_PORT; shout2send->port = DEFAULT_PORT;
shout2send->password = g_strdup (DEFAULT_PASSWORD); shout2send->password = g_strdup (DEFAULT_PASSWORD);
shout2send->username = g_strdup (DEFAULT_USERNAME);
shout2send->streamname = g_strdup (DEFAULT_STREAMNAME); shout2send->streamname = g_strdup (DEFAULT_STREAMNAME);
shout2send->description = g_strdup (DEFAULT_DESCRIPTION); shout2send->description = g_strdup (DEFAULT_DESCRIPTION);
shout2send->genre = g_strdup (DEFAULT_GENRE); shout2send->genre = g_strdup (DEFAULT_GENRE);
@ -465,9 +472,9 @@ gst_shout2send_start (GstBaseSink * basesink)
if (shout_set_mount (sink->conn, sink->mount) != SHOUTERR_SUCCESS) if (shout_set_mount (sink->conn, sink->mount) != SHOUTERR_SUCCESS)
goto set_failed; goto set_failed;
cur_prop = "user"; cur_prop = "username";
GST_DEBUG_OBJECT (sink, "setting %s: %s", cur_prop, "source"); GST_DEBUG_OBJECT (sink, "setting %s: %s", cur_prop, "source");
if (shout_set_user (sink->conn, "source") != SHOUTERR_SUCCESS) if (shout_set_user (sink->conn, sink->username) != SHOUTERR_SUCCESS)
goto set_failed; goto set_failed;
version_string = gst_version_string (); version_string = gst_version_string ();
@ -619,6 +626,11 @@ gst_shout2send_set_property (GObject * object, guint prop_id,
g_free (shout2send->password); g_free (shout2send->password);
shout2send->password = g_strdup (g_value_get_string (value)); shout2send->password = g_strdup (g_value_get_string (value));
break; break;
case ARG_USERNAME:
if (shout2send->username)
g_free (shout2send->username);
shout2send->username = g_strdup (g_value_get_string (value));
break;
case ARG_STREAMNAME: /* Name of the stream */ case ARG_STREAMNAME: /* Name of the stream */
if (shout2send->streamname) if (shout2send->streamname)
g_free (shout2send->streamname); g_free (shout2send->streamname);
@ -671,6 +683,9 @@ gst_shout2send_get_property (GObject * object, guint prop_id,
case ARG_PASSWORD: case ARG_PASSWORD:
g_value_set_string (value, shout2send->password); g_value_set_string (value, shout2send->password);
break; break;
case ARG_USERNAME:
g_value_set_string (value, shout2send->username);
break;
case ARG_STREAMNAME: /* Name of the stream */ case ARG_STREAMNAME: /* Name of the stream */
g_value_set_string (value, shout2send->streamname); g_value_set_string (value, shout2send->streamname);
break; break;

1
ext/shout2/gstshout2.h
View file

@ -47,6 +47,7 @@ struct _GstShout2send {
gchar *ip; gchar *ip;
guint port; guint port;
gchar *password; gchar *password;
gchar *username;
gchar *streamname; gchar *streamname;
gchar *description; gchar *description;
gchar *genre; gchar *genre;