added support for remote dump file
This commit is contained in:
parent
18b51a29ce
commit
19bdccd768
|
@ -62,6 +62,7 @@ void
|
||||||
CastSink :: init ( TcpSocket * socket,
|
CastSink :: init ( TcpSocket * socket,
|
||||||
const char * password,
|
const char * password,
|
||||||
const char * mountPoint,
|
const char * mountPoint,
|
||||||
|
const char * remoteDumpFile,
|
||||||
const char * name,
|
const char * name,
|
||||||
const char * description,
|
const char * description,
|
||||||
const char * url,
|
const char * url,
|
||||||
|
@ -74,6 +75,7 @@ CastSink :: init ( TcpSocket * socket,
|
||||||
this->socket = socket;
|
this->socket = socket;
|
||||||
this->password = Util::strDup( password);
|
this->password = Util::strDup( password);
|
||||||
this->mountPoint = Util::strDup( mountPoint);
|
this->mountPoint = Util::strDup( mountPoint);
|
||||||
|
this->remoteDumpFile = remoteDumpFile ? Util::strDup( remoteDumpFile) : 0;
|
||||||
this->name = Util::strDup( name);
|
this->name = Util::strDup( name);
|
||||||
this->description = Util::strDup( description);
|
this->description = Util::strDup( description);
|
||||||
this->url = Util::strDup( url);
|
this->url = Util::strDup( url);
|
||||||
|
@ -83,7 +85,7 @@ CastSink :: init ( TcpSocket * socket,
|
||||||
this->bufferDuration = bufferDuration;
|
this->bufferDuration = bufferDuration;
|
||||||
|
|
||||||
bufferedSink = new BufferedSink( socket,
|
bufferedSink = new BufferedSink( socket,
|
||||||
(bitRate * 1024 / 8) * bufferDuration );
|
(bitRate * 1024 / 8) * bufferDuration);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,6 +102,9 @@ CastSink :: strip ( void ) throw ( Exception )
|
||||||
|
|
||||||
delete[] password;
|
delete[] password;
|
||||||
delete[] mountPoint;
|
delete[] mountPoint;
|
||||||
|
if ( remoteDumpFile ) {
|
||||||
|
delete[] remoteDumpFile;
|
||||||
|
}
|
||||||
delete[] name;
|
delete[] name;
|
||||||
delete[] description;
|
delete[] description;
|
||||||
delete[] url;
|
delete[] url;
|
||||||
|
@ -136,8 +141,11 @@ CastSink :: open ( void ) throw ( Exception )
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.1 2000/11/05 10:05:48 darkeye
|
Revision 1.2 2000/11/10 20:14:11 darkeye
|
||||||
Initial revision
|
added support for remote dump file
|
||||||
|
|
||||||
|
Revision 1.1.1.1 2000/11/05 10:05:48 darkeye
|
||||||
|
initial version
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
|
|
@ -66,6 +66,7 @@ class CastSink : public Sink
|
||||||
Ref<BufferedSink> bufferedSink;
|
Ref<BufferedSink> bufferedSink;
|
||||||
char * password;
|
char * password;
|
||||||
char * mountPoint;
|
char * mountPoint;
|
||||||
|
char * remoteDumpFile;
|
||||||
|
|
||||||
char * name;
|
char * name;
|
||||||
char * description;
|
char * description;
|
||||||
|
@ -80,6 +81,7 @@ class CastSink : public Sink
|
||||||
init ( TcpSocket * socket,
|
init ( TcpSocket * socket,
|
||||||
const char * password,
|
const char * password,
|
||||||
const char * mountPoint,
|
const char * mountPoint,
|
||||||
|
const char * remoteDumpFile,
|
||||||
const char * name,
|
const char * name,
|
||||||
const char * description,
|
const char * description,
|
||||||
const char * url,
|
const char * url,
|
||||||
|
@ -113,6 +115,7 @@ class CastSink : public Sink
|
||||||
CastSink ( TcpSocket * socket,
|
CastSink ( TcpSocket * socket,
|
||||||
const char * password,
|
const char * password,
|
||||||
const char * mountPoint,
|
const char * mountPoint,
|
||||||
|
const char * remoteDumpFile,
|
||||||
const char * name,
|
const char * name,
|
||||||
const char * description,
|
const char * description,
|
||||||
const char * url,
|
const char * url,
|
||||||
|
@ -125,6 +128,7 @@ class CastSink : public Sink
|
||||||
init( socket,
|
init( socket,
|
||||||
password,
|
password,
|
||||||
mountPoint,
|
mountPoint,
|
||||||
|
remoteDumpFile,
|
||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
url,
|
url,
|
||||||
|
@ -142,6 +146,7 @@ class CastSink : public Sink
|
||||||
init( cs.socket.get(),
|
init( cs.socket.get(),
|
||||||
cs.password,
|
cs.password,
|
||||||
cs.mountPoint,
|
cs.mountPoint,
|
||||||
|
cs.remoteDumpFile,
|
||||||
cs.name,
|
cs.name,
|
||||||
cs.description,
|
cs.description,
|
||||||
cs.url,
|
cs.url,
|
||||||
|
@ -168,6 +173,7 @@ class CastSink : public Sink
|
||||||
init( cs.socket.get(),
|
init( cs.socket.get(),
|
||||||
cs.password,
|
cs.password,
|
||||||
cs.mountPoint,
|
cs.mountPoint,
|
||||||
|
cs.remoteDumpFile,
|
||||||
cs.name,
|
cs.name,
|
||||||
cs.description,
|
cs.description,
|
||||||
cs.url,
|
cs.url,
|
||||||
|
@ -249,6 +255,13 @@ class CastSink : public Sink
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline const char *
|
||||||
|
getRemoteDumpFile ( void ) const throw ()
|
||||||
|
{
|
||||||
|
return remoteDumpFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
inline const char *
|
inline const char *
|
||||||
getName ( void ) const throw ()
|
getName ( void ) const throw ()
|
||||||
{
|
{
|
||||||
|
@ -314,6 +327,9 @@ class CastSink : public Sink
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.3 2000/11/10 20:14:11 darkeye
|
||||||
|
added support for remote dump file
|
||||||
|
|
||||||
Revision 1.2 2000/11/05 17:37:24 darkeye
|
Revision 1.2 2000/11/05 17:37:24 darkeye
|
||||||
removed clone() functions
|
removed clone() functions
|
||||||
|
|
||||||
|
|
|
@ -158,6 +158,13 @@ IceCast :: sendLogin ( void ) throw ( Exception )
|
||||||
str = getIsPublic() ? "yes" : "no";
|
str = getIsPublic() ? "yes" : "no";
|
||||||
sink->write( str, strlen( str));
|
sink->write( str, strlen( str));
|
||||||
|
|
||||||
|
if ( getRemoteDumpFile() ) {
|
||||||
|
str = "\nx-audiocast-dumpfile: ";
|
||||||
|
sink->write( str, strlen( str));
|
||||||
|
str = getRemoteDumpFile();
|
||||||
|
sink->write( str, strlen( str));
|
||||||
|
}
|
||||||
|
|
||||||
str = "\n\n";
|
str = "\n\n";
|
||||||
sink->write( str, strlen( str));
|
sink->write( str, strlen( str));
|
||||||
sink->flush();
|
sink->flush();
|
||||||
|
@ -185,6 +192,9 @@ IceCast :: sendLogin ( void ) throw ( Exception )
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.3 2000/11/10 20:14:11 darkeye
|
||||||
|
added support for remote dump file
|
||||||
|
|
||||||
Revision 1.2 2000/11/05 14:08:28 darkeye
|
Revision 1.2 2000/11/05 14:08:28 darkeye
|
||||||
changed builting to an automake / autoconf environment
|
changed builting to an automake / autoconf environment
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,7 @@ class IceCast : public CastSink
|
||||||
IceCast ( TcpSocket * socket,
|
IceCast ( TcpSocket * socket,
|
||||||
const char * password,
|
const char * password,
|
||||||
const char * mountPoint,
|
const char * mountPoint,
|
||||||
|
const char * remoteDumpFile,
|
||||||
const char * name,
|
const char * name,
|
||||||
const char * description,
|
const char * description,
|
||||||
const char * url,
|
const char * url,
|
||||||
|
@ -93,6 +94,7 @@ class IceCast : public CastSink
|
||||||
: CastSink( socket,
|
: CastSink( socket,
|
||||||
password,
|
password,
|
||||||
mountPoint,
|
mountPoint,
|
||||||
|
remoteDumpFile,
|
||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
url,
|
url,
|
||||||
|
@ -143,6 +145,9 @@ class IceCast : public CastSink
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.3 2000/11/10 20:14:11 darkeye
|
||||||
|
added support for remote dump file
|
||||||
|
|
||||||
Revision 1.2 2000/11/05 17:37:24 darkeye
|
Revision 1.2 2000/11/05 17:37:24 darkeye
|
||||||
removed clone() functions
|
removed clone() functions
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue