adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed the order of shoutcast metadata

This commit is contained in:
darkeye 2006-07-16 16:46:40 +00:00
parent 297f3dc0f8
commit 0ca88976b9
1 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
darkice/trunk/src/ShoutCast.cpp
View File

@ -162,13 +162,6 @@ ShoutCast :: sendLogin ( void ) throw ( Exception )
sink->write( str, strlen( str)); sink->write( str, strlen( str));
} }
if ( getUrl() ) {
str = "\nicy-url:";
sink->write( str, strlen( str));
str = getUrl();
sink->write( str, strlen( str));
}
if ( getGenre() ) { if ( getGenre() ) {
str = "\nicy-genre:"; str = "\nicy-genre:";
sink->write( str, strlen( str)); sink->write( str, strlen( str));
@ -176,26 +169,10 @@ ShoutCast :: sendLogin ( void ) throw ( Exception )
sink->write( str, strlen( str)); sink->write( str, strlen( str));
} }
if ( getIrc() ) { str = "\nicy-pub:";
str = "\nicy-irc:"; sink->write( str, strlen( str));
sink->write( str, strlen( str)); str = getIsPublic() ? "1" : "0";
str = getIrc(); sink->write( str, strlen( str));
sink->write( str, strlen( str));
}
if ( getAim() ) {
str = "\nicy-aim:";
sink->write( str, strlen( str));
str = getAim();
sink->write( str, strlen( str));
}
if ( getIcq() ) {
str = "\nicy-icq:";
sink->write( str, strlen( str));
str = getIcq();
sink->write( str, strlen( str));
}
str = "\nicy-br:"; str = "\nicy-br:";
sink->write( str, strlen( str)); sink->write( str, strlen( str));
@ -206,15 +183,48 @@ ShoutCast :: sendLogin ( void ) throw ( Exception )
sprintf( resp, "%d", getBitRate()); sprintf( resp, "%d", getBitRate());
sink->write( resp, strlen( resp)); sink->write( resp, strlen( resp));
str = "\nicy-pub:"; if ( getUrl() ) {
sink->write( str, strlen( str)); str = "\nicy-url:";
str = getIsPublic() ? "1" : "0"; sink->write( str, strlen( str));
sink->write( str, strlen( str)); str = getUrl();
sink->write( str, strlen( str));
}
if ( getIrc() ) {
str = "\nicy-irc:";
sink->write( str, strlen( str));
str = getIrc();
sink->write( str, strlen( str));
}
if ( getIcq() ) {
str = "\nicy-icq:";
sink->write( str, strlen( str));
str = getIcq();
sink->write( str, strlen( str));
}
if ( getAim() ) {
str = "\nicy-aim:";
sink->write( str, strlen( str));
str = getAim();
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();
/* suck anything that the other side has to say */
len = source->read( resp, STRBUF_SIZE);
reportEvent(8, "server response length: ", len);
reportEvent(8, "server response: ", resp);
while ( source->canRead( 0, 0) &&
(len = source->read( resp, STRBUF_SIZE)) ) {
;
}
return true; return true;
} }
@ -225,6 +235,9 @@ ShoutCast :: sendLogin ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.5 2006/07/16 16:46:40 darkeye
changed the order of shoutcast metadata
Revision 1.4 2006/07/16 16:24:46 darkeye Revision 1.4 2006/07/16 16:24:46 darkeye
moved shoutcast server response checking right after passing password moved shoutcast server response checking right after passing password
to the server. this should solve connection issues for recent to the server. this should solve connection issues for recent