* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
#include <vlc/vlc.h>
char *psz_buffer = malloc( BUF_SIZE );
char *psz_string = NULL;
- if( rtsp->pf_read_line( rtsp->p_userdata, psz_buffer, BUF_SIZE ) >= 0 )
+ if( rtsp->pf_read_line( rtsp->p_userdata, (uint8_t*)psz_buffer, (unsigned int)BUF_SIZE ) >= 0 )
{
//printf( "<< '%s'\n", psz_buffer );
psz_string = strdup( psz_buffer );
static int rtsp_put( rtsp_client_t *rtsp, const char *psz_string )
{
- int i_buffer = strlen( psz_string );
+ unsigned int i_buffer = strlen( psz_string );
char *psz_buffer = malloc( i_buffer + 3 );
int i_ret;
psz_buffer[i_buffer] = '\r'; psz_buffer[i_buffer+1] = '\n';
psz_buffer[i_buffer+2] = 0;
- i_ret = rtsp->pf_write( rtsp->p_userdata, psz_buffer, i_buffer + 2 );
+ i_ret = rtsp->pf_write( rtsp->p_userdata, (uint8_t*)psz_buffer, i_buffer + 2 );
free( psz_buffer );
return i_ret;
if( i_code != 200 )
{
- fprintf( stderr, "librtsp: server responds: '%s'\n", psz_string );
+ //fprintf( stderr, "librtsp: server responds: '%s'\n", psz_string );
}
return i_code;
{
if( strcmp( buf, rtsp->p_private->session ) )
{
- fprintf( stderr,
- "rtsp: warning: setting NEW session: %s\n", buf );
+ //fprintf( stderr,
+ // "rtsp: warning: setting NEW session: %s\n", buf );
free( rtsp->p_private->session );
rtsp->p_private->session = strdup( buf );
}
}
else
{
- fprintf( stderr, "setting session id to: %s\n", buf );
+ //fprintf( stderr, "setting session id to: %s\n", buf );
rtsp->p_private->session = strdup( buf );
}
free( buf );
* read opaque data from stream
*/
-int rtsp_read_data( rtsp_client_t *rtsp, char *buffer, unsigned int size )
+int rtsp_read_data( rtsp_client_t *rtsp, uint8_t *buffer, unsigned int size )
{
int i, seq;
if( size >= 4 )
{
- i = rtsp->pf_read( rtsp->p_userdata, buffer, 4 );
+ i = rtsp->pf_read( rtsp->p_userdata, (uint8_t*)buffer, (unsigned int) 4 );
if( i < 4 ) return i;
if( buffer[0]=='S' && buffer[1]=='E' && buffer[2]=='T' &&
if( seq < 0 )
{
- fprintf(stderr, "warning: cseq not recognized!\n");
+ //fprintf(stderr, "warning: cseq not recognized!\n");
seq = 1;
}
rtsp_put( rtsp, rest );
rtsp_put( rtsp, "" );
free( rest );
- i = rtsp->pf_read( rtsp->p_userdata, buffer, size );
+ i = rtsp->pf_read( rtsp->p_userdata, (unsigned char*)buffer, size );
}
else
{
- i = rtsp->pf_read( rtsp->p_userdata, buffer + 4, size - 4 );
+ i = rtsp->pf_read( rtsp->p_userdata, (unsigned char*)buffer + 4, size - 4 );
i += 4;
}
}
- else i = rtsp->pf_read( rtsp->p_userdata, buffer, size );
+ else i = rtsp->pf_read( rtsp->p_userdata, (unsigned char*)buffer, size );
//fprintf( stderr, "<< %d of %d bytes\n", i, size );
colon = strchr( mrl_ptr, ':' );
if( !slash ) slash = mrl_ptr + strlen(mrl_ptr) + 1;
- if( !colon ) colon = slash;
+ if( !colon ) colon = slash;
if( colon > slash ) colon = slash;
pathbegin = slash - mrl_ptr;
}
free( mrl_ptr );
- fprintf( stderr, "got mrl: %s %i %s\n", s->host, s->port, s->path );
+ //fprintf( stderr, "got mrl: %s %i %s\n", s->host, s->port, s->path );
s->s = rtsp->pf_connect( rtsp->p_userdata, s->host, s->port );
if( s->s < 0 )
{
- fprintf(stderr, "rtsp: failed to connect to '%s'\n", s->host);
+ //fprintf(stderr, "rtsp: failed to connect to '%s'\n", s->host);
rtsp_close( rtsp );
return -1;
}
}
/*
- * closes an rtsp connection
+ * closes an rtsp connection
*/
void rtsp_close( rtsp_client_t *rtsp )
}
/*
- * removes the first scheduled field which prefix matches string.
+ * removes the first scheduled field which prefix matches string.
*/
void rtsp_unschedule_field( rtsp_client_t *rtsp, const char *string )