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

Fixed SHOUTCast password 

- Darkice.cpp configShoutcast part is returned as it was on commit 710d2c26c4 . This makes DNAS 1.9.8 to work again.
- Added suggested code patches to code at DarkiceConfig.cpp and Config.cpp by Yahoosam on issu #121. So DNAS2.x now can get stream IDs
This commit is contained in:
Alejandro Olivan Alvarez 2018-07-06 12:39:17 +02:00
parent 8f52426a7e
commit ad68e8dce2
3 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
darkice/trunk/src/ConfigSection.cpp
View File

@ -8,19 +8,19 @@
Version : $Revision$ Version : $Revision$
Author : $Author$ Author : $Author$
Location : $HeadURL$ Location : $HeadURL$
Copyright notice: Copyright notice:
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3 as published by the Free Software Foundation; either version 3
of the License, or (at your option) any later version. of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@ -81,8 +81,8 @@ ConfigSection :: add ( const char * key,
return res.second; return res.second;
} }
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Get a value for a key * Get a value for a key
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
@ -112,7 +112,7 @@ ConfigSection :: getForSure ( const char * key,
throw ( Exception ) throw ( Exception )
{ {
const char * value; const char * value;
if ( !(value = get( key)) ) { if ( !(value = get( key)) ) {
throw Exception( __FILE__, __LINE__, key, message1, message2, code); throw Exception( __FILE__, __LINE__, key, message1, message2, code);
} }
@ -132,12 +132,16 @@ ConfigSection :: addLine ( const char * line ) throw ( Exception )
} }
std::string::size_type ix; std::string::size_type ix;
std::string str( line); std::string str( line);
std::string str2 ("password");
/* delete everything after the first # */ if ( (ix = str.find(str2)) == str.npos ) {
if ( (ix = str.find( '#')) != str.npos ) { /* delete everything after the first # */
str.erase( ix); if ( (ix = str.find( '#')) != str.npos ) {
str.erase( ix);
}
} }
/* eat up all white space from the front */ /* eat up all white space from the front */
if ( (ix = str.find_first_not_of( WHITE_SPACE_STR)) != str.npos ) { if ( (ix = str.find_first_not_of( WHITE_SPACE_STR)) != str.npos ) {
str.erase( 0, ix); str.erase( 0, ix);
@ -170,4 +174,3 @@ ConfigSection :: addLine ( const char * line ) throw ( Exception )
/* now add the new key / value pair */ /* now add the new key / value pair */
return add( key.c_str(), value.c_str()); return add( key.c_str(), value.c_str());
} }

27
darkice/trunk/src/DarkIce.cpp
View File

@ -8,20 +8,20 @@
Version : $Revision$ Version : $Revision$
Author : $Author$ Author : $Author$
Location : $HeadURL$ Location : $HeadURL$
Copyright notice: Copyright notice:
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3 as published by the Free Software Foundation; either version 3
of the License, or (at your option) any later version. of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@ -384,9 +384,9 @@ DarkIce :: configIceCast ( const Config & config,
"unsupported stream format: ", str); "unsupported stream format: ", str);
} }
// augment audio outs with a buffer when used from encoder // augment audio outs with a buffer when used from encoder
audioOut = new BufferedSink( audioOuts[u].server.get(), audioOut = new BufferedSink( audioOuts[u].server.get(),
bufferSize, 1); bufferSize, 1);
#ifdef HAVE_LAME_LIB #ifdef HAVE_LAME_LIB
@ -600,9 +600,9 @@ DarkIce :: configIceCast2 ( const Config & config,
isPublic, isPublic,
localDumpFile); localDumpFile);
audioOut = new BufferedSink( audioOuts[u].server.get(), audioOut = new BufferedSink( audioOuts[u].server.get(),
bufferSize, 1); bufferSize, 1);
switch ( format ) { switch ( format ) {
case IceCast2::mp3: case IceCast2::mp3:
#ifndef HAVE_LAME_LIB #ifndef HAVE_LAME_LIB
@ -792,7 +792,7 @@ DarkIce :: configShoutCast ( const Config & config,
FileSink * localDumpFile = 0; FileSink * localDumpFile = 0;
bool fileAddDate = false; bool fileAddDate = false;
const char * fileDateFormat = 0; const char * fileDateFormat = 0;
BufferedSink * audioOut = 0; AudioEncoder * encoder = 0;
int bufferSize = 0; int bufferSize = 0;
str = cs->get( "sampleRate"); str = cs->get( "sampleRate");
@ -907,9 +907,7 @@ DarkIce :: configShoutCast ( const Config & config,
localDumpFile); localDumpFile);
audioOut = new BufferedSink(audioOuts[u].socket.get(), bufferSize, 1); encoder = new LameLibEncoder( audioOuts[u].server.get(),
audioOuts[u].encoder = new LameLibEncoder(
audioOut,
dsp.get(), dsp.get(),
bitrateMode, bitrateMode,
bitrate, bitrate,
@ -918,6 +916,7 @@ DarkIce :: configShoutCast ( const Config & config,
channel, channel,
lowpass, lowpass,
highpass ); highpass );
audioOuts[u].encoder = new BufferedSink(encoder, bufferSize, dsp->getSampleSize());
encConnector->attach( audioOuts[u].encoder.get()); encConnector->attach( audioOuts[u].encoder.get());
#endif // HAVE_LAME_LIB #endif // HAVE_LAME_LIB

26
darkice/trunk/src/DarkIceConfig.cpp
View File

@ -8,19 +8,19 @@
Version : $Revision$ Version : $Revision$
Author : $Author$ Author : $Author$
Location : $HeadURL$ Location : $HeadURL$
Copyright notice: Copyright notice:
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3 as published by the Free Software Foundation; either version 3
of the License, or (at your option) any later version. of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@ -98,12 +98,16 @@ Config :: addLine ( const char * line ) throw ( Exception )
} }
std::string::size_type ix; std::string::size_type ix;
std::string str( line); std::string str( line);
std::string str2 ("password");
/* delete everything after the first # */ if ( (ix = str.find(str2)) == str.npos ) {
if ( (ix = str.find( '#')) != str.npos ) { /* delete everything after the first # */
str.erase( ix); if ( (ix = str.find( '#')) != str.npos ) {
str.erase( ix);
}
} }
/* eat up all white space from the front */ /* eat up all white space from the front */
if ( (ix = str.find_first_not_of( WHITE_SPACE_STR)) != str.npos ) { if ( (ix = str.find_first_not_of( WHITE_SPACE_STR)) != str.npos ) {
str.erase( 0, ix); str.erase( 0, ix);
@ -162,5 +166,3 @@ Config :: read ( std::istream & is ) throw ( Exception )
addLine( line); addLine( line);
} }
} }