summaryrefslogtreecommitdiff
path: root/gst/rtsp-server/rtsp-client.h
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-10-25 21:29:58 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2012-10-25 21:29:58 +0200
commitde7c72dec2a022b90cefe21ec0a92b1ad452c19d (patch)
treec7fbab9d253c93477f3a59cbfca445c242ed876c /gst/rtsp-server/rtsp-client.h
parent0de6262dc4f816c69d2a768068fd548c923cb61c (diff)
rtsp: massive refactoring
Make GObjects from the remaining simple structures. Remove GstRTSPSessionStream, it's not needed. Rename GstRTSPMediaStream -> GstRTSPStream: It is shorter Rename GstRTSPMediaTrans -> GstRTSPStreamTransport: It describes how a GstRTSPStream should be transported to a client. Rename GstRTSPMediaFactory::get_element -> create_element because that more accurately describes what it does. Make nice methods instead of poking in the structures. Move some methods inside the relevant object source code. Use GPtrArray to store objects instead of plain arrays, it is more natural and allows us to more easily clean up. Move the allocation of udp ports to the Stream object. The Stream object contains the elements needed to stream the media to a client. Improve the prepare and unprepare methods. Unprepare should now undo everything prepare did. Improve also async unprepare when doing EOS on shutdown. Make sure we always unprepare correctly.
Diffstat (limited to 'gst/rtsp-server/rtsp-client.h')
-rw-r--r--gst/rtsp-server/rtsp-client.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/rtsp-server/rtsp-client.h b/gst/rtsp-server/rtsp-client.h
index 4712d1e..cd08f7e 100644
--- a/gst/rtsp-server/rtsp-client.h
+++ b/gst/rtsp-server/rtsp-client.h
@@ -33,6 +33,7 @@ typedef struct _GstRTSPClientState GstRTSPClientState;
#include "rtsp-media.h"
#include "rtsp-media-mapping.h"
#include "rtsp-session-pool.h"
+#include "rtsp-session-media.h"
#include "rtsp-auth.h"
#include "rtsp-sdp.h"
@@ -58,7 +59,7 @@ typedef struct _GstRTSPClientState GstRTSPClientState;
*
* Information passed around containing the client state of a request.
*/
-struct _GstRTSPClientState{
+struct _GstRTSPClientState {
GstRTSPMessage *request;
GstRTSPUrl *uri;
GstRTSPMethod method;
@@ -81,7 +82,7 @@ struct _GstRTSPClientState{
* @media_mapping: handle to the media mapping used by the client.
* @uri: cached uri
* @media: cached media
- * @streams: a list of streams using @connection.
+ * @transports: a list of #GstRTSPStreamTransport using @connection.
* @sessions: a list of sessions managed by @connection.
*
* The client structure.
@@ -104,7 +105,7 @@ struct _GstRTSPClient {
GstRTSPUrl *uri;
GstRTSPMedia *media;
- GList *streams;
+ GList *transports;
GList *sessions;
};