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

Changed mechanism for testing the presence of the quality value such that 

zero is a valid option.
This commit is contained in:
jbebel 2005-04-03 05:12:20 +00:00
parent a64a9ea837
commit a30b513b8f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,7 @@ DarkIce :: configIceCast ( const Config & config,
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"bitrate not specified for CBR encoding"); "bitrate not specified for CBR encoding");
} }
if ( quality == 0 ) { if ( cs->get( "quality" ) == 0 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"quality not specified for CBR encoding"); "quality not specified for CBR encoding");
} }
@ -256,7 +256,7 @@ DarkIce :: configIceCast ( const Config & config,
} else if ( Util::strEq( str, "vbr") ) { } else if ( Util::strEq( str, "vbr") ) {
bitrateMode = AudioEncoder::vbr; bitrateMode = AudioEncoder::vbr;
if ( quality == 0 ) { if ( cs->get( "quality" ) == 0 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"quality not specified for VBR encoding"); "quality not specified for VBR encoding");
} }
@ -430,7 +430,7 @@ DarkIce :: configIceCast2 ( const Config & config,
} else if ( Util::strEq( str, "vbr") ) { } else if ( Util::strEq( str, "vbr") ) {
bitrateMode = AudioEncoder::vbr; bitrateMode = AudioEncoder::vbr;
if ( quality == 0 ) { if ( cs->get( "quality" ) == 0 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"quality not specified for VBR encoding"); "quality not specified for VBR encoding");
} }
@ -617,7 +617,7 @@ DarkIce :: configShoutCast ( const Config & config,
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"bitrate not specified for CBR encoding"); "bitrate not specified for CBR encoding");
} }
if ( quality == 0 ) { if ( cs->get( "quality" ) == 0 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"quality not specified for CBR encoding"); "quality not specified for CBR encoding");
} }
@ -631,7 +631,7 @@ DarkIce :: configShoutCast ( const Config & config,
} else if ( Util::strEq( str, "vbr") ) { } else if ( Util::strEq( str, "vbr") ) {
bitrateMode = AudioEncoder::vbr; bitrateMode = AudioEncoder::vbr;
if ( quality == 0 ) { if ( cs->get( "quality" ) == 0 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"quality not specified for VBR encoding"); "quality not specified for VBR encoding");
} }
@ -778,7 +778,7 @@ DarkIce :: configFileCast ( const Config & config )
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"bitrate not specified for CBR encoding"); "bitrate not specified for CBR encoding");
} }
if ( quality == 0 ) { if ( cs->get( "quality" ) == 0 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"quality not specified for CBR encoding"); "quality not specified for CBR encoding");
} }
@ -792,7 +792,7 @@ DarkIce :: configFileCast ( const Config & config )
} else if ( Util::strEq( str, "vbr") ) { } else if ( Util::strEq( str, "vbr") ) {
bitrateMode = AudioEncoder::vbr; bitrateMode = AudioEncoder::vbr;
if ( quality == 0 ) { if ( cs->get( "quality" ) == 0 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"quality not specified for VBR encoding"); "quality not specified for VBR encoding");
} }
@ -1010,6 +1010,10 @@ DarkIce :: run ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.41 2005/04/03 05:12:20 jbebel
Changed mechanism for testing the presence of the quality value such that
zero is a valid option.
Revision 1.40 2004/02/23 19:12:51 darkeye Revision 1.40 2004/02/23 19:12:51 darkeye
ported to NetBSD ported to NetBSD