mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix for channel -> watch rename in gstreamer

Browse source 
Rename the RTSPChannel to RTSPWatch and remove an unused variable.
This commit is contained in:
Wim Taymans 2009-02-19 15:53:50 +01:00
parent 39c2e31e65
commit daf27d2704
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/rtsp-server/rtsp-client.c
View file

@ -187,7 +187,7 @@ send_response (GstRTSPClient *client, GstRTSPSession *session, GstRTSPMessage *r
#if 0 #if 0
gst_rtsp_connection_send (client->connection, response, &timeout); gst_rtsp_connection_send (client->connection, response, &timeout);
#endif #endif
gst_rtsp_channel_queue_message (client->channel, response); gst_rtsp_watch_queue_message (client->watch, response);
gst_rtsp_message_unset (response); gst_rtsp_message_unset (response);
} }
@ -990,7 +990,7 @@ gst_rtsp_client_get_media_mapping (GstRTSPClient *client)
} }
static GstRTSPResult static GstRTSPResult
message_received (GstRTSPChannel *channel, GstRTSPMessage *message, gpointer user_data) message_received (GstRTSPWatch *watch, GstRTSPMessage *message, gpointer user_data)
{ {
GstRTSPClient *client = GST_RTSP_CLIENT (user_data); GstRTSPClient *client = GST_RTSP_CLIENT (user_data);
@ -1002,7 +1002,7 @@ message_received (GstRTSPChannel *channel, GstRTSPMessage *message, gpointer use
} }
static GstRTSPResult static GstRTSPResult
message_sent (GstRTSPChannel *channel, guint cseq, gpointer user_data) message_sent (GstRTSPWatch *watch, guint cseq, gpointer user_data)
{ {
GstRTSPClient *client = GST_RTSP_CLIENT (user_data); GstRTSPClient *client = GST_RTSP_CLIENT (user_data);
@ -1012,7 +1012,7 @@ message_sent (GstRTSPChannel *channel, guint cseq, gpointer user_data)
} }
static GstRTSPResult static GstRTSPResult
closed (GstRTSPChannel *channel, gpointer user_data) closed (GstRTSPWatch *watch, gpointer user_data)
{ {
GstRTSPClient *client = GST_RTSP_CLIENT (user_data); GstRTSPClient *client = GST_RTSP_CLIENT (user_data);
@ -1022,7 +1022,7 @@ closed (GstRTSPChannel *channel, gpointer user_data)
} }
static GstRTSPResult static GstRTSPResult
error (GstRTSPChannel *channel, GstRTSPResult result, gpointer user_data) error (GstRTSPWatch *watch, GstRTSPResult result, gpointer user_data)
{ {
GstRTSPClient *client = GST_RTSP_CLIENT (user_data); GstRTSPClient *client = GST_RTSP_CLIENT (user_data);
gchar *str; gchar *str;
@ -1034,7 +1034,7 @@ error (GstRTSPChannel *channel, GstRTSPResult result, gpointer user_data)
return GST_RTSP_OK; return GST_RTSP_OK;
} }
static GstRTSPChannelFuncs channel_funcs = { static GstRTSPWatchFuncs watch_funcs = {
message_received, message_received,
message_sent, message_sent,
closed, closed,
@ -1072,11 +1072,11 @@ gst_rtsp_client_accept (GstRTSPClient *client, GIOChannel *channel)
client->connection = conn; client->connection = conn;
/* create channel for the connection and attach */ /* create watch for the connection and attach */
client->channel = gst_rtsp_channel_new (client->connection, &channel_funcs, client->watch = gst_rtsp_watch_new (client->connection, &watch_funcs,
g_object_ref (client), g_object_unref); g_object_ref (client), g_object_unref);
/* find the context to add the channel */ /* find the context to add the watch */
if ((source = g_main_current_source ())) if ((source = g_main_current_source ()))
context = g_source_get_context (source); context = g_source_get_context (source);
else else
@ -1084,8 +1084,8 @@ gst_rtsp_client_accept (GstRTSPClient *client, GIOChannel *channel)
g_message ("attaching to context %p", context); g_message ("attaching to context %p", context);
gst_rtsp_channel_attach (client->channel, context); gst_rtsp_watch_attach (client->watch, context);
gst_rtsp_channel_unref (client->channel); gst_rtsp_watch_unref (client->watch);
return TRUE; return TRUE;

3
gst/rtsp-server/rtsp-client.h
View file

@ -70,8 +70,7 @@ struct _GstRTSPClient {
GObject parent; GObject parent;
GstRTSPConnection *connection; GstRTSPConnection *connection;
GstRTSPChannel *channel; GstRTSPWatch *watch;
GThread *thread;
guint timeout; guint timeout;
GstRTSPSessionPool *session_pool; GstRTSPSessionPool *session_pool;