[MPlayer-cvslog] r27136 - in trunk/stream/librtsp: rtsp.c rtsp.h rtsp_session.c

[lu_zero]

Author: lu_zero
Date: Wed Jun 25 15:03:18 2008
New Revision: 27136

Log:
Fix the issue instead of reverting

Modified:
   trunk/stream/librtsp/rtsp.c
   trunk/stream/librtsp/rtsp.h
   trunk/stream/librtsp/rtsp_session.c

Modified: trunk/stream/librtsp/rtsp.c
==============================================================================
--- trunk/stream/librtsp/rtsp.c	(original)
+++ trunk/stream/librtsp/rtsp.c	Wed Jun 25 15:03:18 2008
@@ -33,14 +33,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include "config.h"
-#ifndef HAVE_WINSOCK2
-#define closesocket close
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#else
-#include <winsock2.h>
-#endif
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -60,56 +52,6 @@
 #define LOG
 */
 
-#define BUF_SIZE 4096
-#define HEADER_SIZE 1024
-#define MAX_FIELDS 256
-
-struct rtsp_s {
-
-  int           s;
-
-  char         *host;
-  int           port;
-  char         *path;
-  char         *param;
-  char         *mrl;
-  char         *user_agent;
-
-  char         *server;
-  unsigned int  server_state;
-  uint32_t      server_caps;
-  
-  unsigned int  cseq;
-  char         *session;
-
-  char        *answers[MAX_FIELDS];   /* data of last message */
-  char        *scheduled[MAX_FIELDS]; /* will be sent with next message */
-};
-
-/*
- * constants
- */
-
-#define RTSP_PROTOCOL_VERSION "RTSP/1.0"
-
-/* server states */
-#define RTSP_CONNECTED 1
-#define RTSP_INIT      2
-#define RTSP_READY     4
-#define RTSP_PLAYING   8
-#define RTSP_RECORDING 16
-
-/* server capabilities */
-#define RTSP_OPTIONS       0x001
-#define RTSP_DESCRIBE      0x002
-#define RTSP_ANNOUNCE      0x004
-#define RTSP_SETUP         0x008
-#define RTSP_GET_PARAMETER 0x010
-#define RTSP_SET_PARAMETER 0x020
-#define RTSP_TEARDOWN      0x040
-#define RTSP_PLAY          0x080
-#define RTSP_RECORD        0x100
-
 /*
  * network utilities
  */

Modified: trunk/stream/librtsp/rtsp.h
==============================================================================
--- trunk/stream/librtsp/rtsp.h	(original)
+++ trunk/stream/librtsp/rtsp.h	Wed Jun 25 15:03:18 2008
@@ -32,6 +32,7 @@
 #ifndef MPLAYER_RTSP_H
 #define MPLAYER_RTSP_H
 
+#include <inttypes.h>
 
 /* some codes returned by rtsp_request_* functions */
 
@@ -45,6 +46,58 @@
 #define RTSP_METHOD_TEARDOWN "TEARDOWN"
 #define RTSP_METHOD_SET_PARAMETER "SET_PARAMETER"
 
+#define BUF_SIZE 4096
+#define HEADER_SIZE 1024
+#define MAX_FIELDS 256
+
+
+struct rtsp_s {
+
+  int           s;
+
+  char         *host;
+  int           port;
+  char         *path;
+  char         *param;
+  char         *mrl;
+  char         *user_agent;
+
+  char         *server;
+  unsigned int  server_state;
+  uint32_t      server_caps;
+  
+  unsigned int  cseq;
+  char         *session;
+
+  char        *answers[MAX_FIELDS];   /* data of last message */
+  char        *scheduled[MAX_FIELDS]; /* will be sent with next message */
+};
+
+/*
+ * constants
+ */
+
+#define RTSP_PROTOCOL_VERSION "RTSP/1.0"
+
+/* server states */
+#define RTSP_CONNECTED 1
+#define RTSP_INIT      2
+#define RTSP_READY     4
+#define RTSP_PLAYING   8
+#define RTSP_RECORDING 16
+
+/* server capabilities */
+#define RTSP_OPTIONS       0x001
+#define RTSP_DESCRIBE      0x002
+#define RTSP_ANNOUNCE      0x004
+#define RTSP_SETUP         0x008
+#define RTSP_GET_PARAMETER 0x010
+#define RTSP_SET_PARAMETER 0x020
+#define RTSP_TEARDOWN      0x040
+#define RTSP_PLAY          0x080
+#define RTSP_RECORD        0x100
+
+
 typedef struct rtsp_s rtsp_t;
 
 rtsp_t*  rtsp_connect (int fd, char *mrl, char *path, char *host, int port, char *user_agent);

Modified: trunk/stream/librtsp/rtsp_session.c
==============================================================================
--- trunk/stream/librtsp/rtsp_session.c	(original)
+++ trunk/stream/librtsp/rtsp_session.c	Wed Jun 25 15:03:18 2008
@@ -31,12 +31,15 @@
 #include <sys/types.h>
 #include "config.h"
 #ifndef HAVE_WINSOCK2
+#define closesocket close
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #else
 #include <winsock2.h>
 #endif
+
+
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>