Ready to release.

git-svn-id: svn://svn.code.sf.net/p/bs2b/code/trunk/libbs2b@89 bc0edfbe-c936-4687-b64d-f70bc3985e72

5 files changed, 61 insertions, 54 deletions

diff --git a/src/bs2bconvert.c b/src/bs2bconvert.c
index b845e7f..2d635ac 100644
--- a/src/bs2bconvert.c
+++ b/src/bs2bconvert.c
@@ -38,15 +38,15 @@ static void copy_data( SNDFILE *outfile, SNDFILE *infile, t_bs2bdp bs2bdp );
 static void print_usage( char *progname )
 {
 	printf( "\n"
-		"    Bauer stereophonic-to-binaural DSP converter. "
-		"Version %s\n",
+		"Bauer stereophonic-to-binaural DSP converter. Version %s\n\n",
 		BS2B_VERSION_STR );
-	printf( "Usage : %s [-x] <input file> <output file>\n", progname );
-	printf( "\n"
-		"    'x' is number of:\n"
-		"    1,2,3 - Low to High crossfeed levels,\n"
-		"    4,5,6 - Low to High crossfeed levels of 'Easy' version\n"
-		"    The default crossfeed level is 6\n" );
+	printf(
+		"Usage : %s [-x] <input file> <output file>\n", progname );
+	printf(
+		" x=d|c|m:\n"
+		"   d - default preset     - 700Hz/260us, 4.5 dB;\n"
+		"   c - Chu Moy's preset   - 700Hz/260us, 6.0 dB;\n"
+		"   m - Jan Meier's preset - 650Hz/280us, 9.5 dB.\n" );
 } /* print_usage() */
 
 int main( int argc, char *argv[] )
@@ -84,25 +84,21 @@ int main( int argc, char *argv[] )
 
 		switch( argv[ 1 ][ 1 ] )
 		{
-		case '1':
-			level = BS2B_LOW_CLEVEL;
-			break;
-
-		case '2':
-			level = BS2B_MIDDLE_CLEVEL;
+		case 'c':
+			level = BS2B_CMOY_CLEVEL;
 			break;
 
-		case '3':
-			level = BS2B_HIGH_CLEVEL;
+		case 'm':
+			level = BS2B_JMEIER_CLEVEL;
 			break;
 
-		case '4':
-			level = BS2B_LOW_ECLEVEL;
+		case 'd':
+			level = BS2B_DEFAULT_CLEVEL;
 			break;
 
-		case '5':
-			level = BS2B_MIDDLE_ECLEVEL;
-			break;
+		default:
+			print_usage( progname );
+			return 1;
 		} /* switch */
 	}
 
@@ -137,12 +133,8 @@ int main( int argc, char *argv[] )
 		return 1;
 	}
 
-	{
-		char *levels[] = { "low", "middle", "high", "low easy", "middle easy", "high easy" };
-
-		printf( "Converting file %s to file %s\nsample rate=%u, crossfeed level=%s...",
-			infilename, outfilename, srate, levels[ level - 1 ] );
-	}
+	printf( "Converting file %s to file %s\nsample rate=%u...",
+		infilename, outfilename, srate );
 
 	if( !( bs2bdp = bs2b_open() ) )
 	{
diff --git a/src/bs2bstream.c b/src/bs2bstream.c
index 00e54d4..ae9ddde 100644
--- a/src/bs2bstream.c
+++ b/src/bs2bstream.c
@@ -35,21 +35,21 @@
 static void print_usage( char *progname )
 {
 	fprintf( stderr, "\n"
-		"    Bauer stereophonic-to-binaural DSP stream converter. Version %s\n"
-		"    LPCM stdin-stdout\n",
+		"Bauer stereophonic-to-binaural DSP stream converter. Version %s\n"
+		"LPCM stdin-stdout\n\n",
 		BS2B_VERSION_STR );
 	fprintf( stderr, "Usage : %s [-h] [-u] [-e E] [-b B] [-r R] [-l L]\n",
 		progname );
-	fprintf( stderr, "\n"
-		"    -h - this help\n"
-		"    -u - unsigned data (default=signed)\n"
-		"    -e - endians, E=b/l/n (big/little/native) (default=n)\n"
-		"    -b - bits per integer sample, B=8/16/24/32 (default=16)\n"
-		"    -r - sample rate, R=<value by kHz> (default=44.1)\n"
-		"    -l - crossfeed level, L is number of:\n"
-		"    1,2,3 - Low to High crossfeed levels,\n"
-		"    4,5,6 - Low to High crossfeed levels of 'Easy' version\n"
-		"    (default=6)\n" );
+	fprintf( stderr,
+		"-h - this help.\n"
+		"-u - unsigned data. Default is signed.\n"
+		"-e - endians, E = b|l|n (big|little|native). Default is native.\n"
+		"-b - bits per integer sample, B=8|16|24|32. Default is 16 bit.\n"
+		"-r - sample rate, R = <value by kHz>. Default is 44.1 kHz.\n"
+		"-l - crossfeed level, L=d|c|m:\n"
+		"     d - default preset     - 700Hz/260us, 4.5 dB;\n"
+		"     c - Chu Moy's preset   - 700Hz/260us, 6.0 dB;\n"
+		"     m - Jan Meier's preset - 650Hz/280us, 9.5 dB.\n" );
 } /* print_usage() */
 
 int main( int argc, char *argv[] )
@@ -60,7 +60,7 @@ int main( int argc, char *argv[] )
 	t_bs2bdp bs2bdp;
 
 	uint32_t srate = 44100;
-	uint32_t level = 6;
+	uint32_t level = 'd';
 	int bits = 16;
 	int unsigned_flag = 0;
 	int endians = 'n';
@@ -145,8 +145,10 @@ int main( int argc, char *argv[] )
 						print_usage( progname );
 						return 1;
 					}
-					level = atoi( argv[ i ] );
-					if( level > 6 || level < 1 )
+					level = argv[ i ][ 0 ];
+					if( level != 'd' &&
+						level != 'c' &&
+						level != 'm' )
 					{
 						print_usage( progname );
 						return 1;
@@ -159,6 +161,19 @@ int main( int argc, char *argv[] )
 		} /* if */
 	} /* for */
 
+	switch( level )
+	{
+	case 'c':
+		level = BS2B_CMOY_CLEVEL;
+		break;
+	case 'm':
+		level = BS2B_JMEIER_CLEVEL;
+		break;
+	default:
+		level = BS2B_DEFAULT_CLEVEL;
+		break;
+	} /* switch */
+
 	#if defined( _O_BINARY )
 	_setmode( _fileno( stdin ),  _O_BINARY );
 	_setmode( _fileno( stdout ), _O_BINARY );
@@ -199,7 +214,7 @@ int main( int argc, char *argv[] )
 				case 'b':
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s16be( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u16be( bs2bdp, sample, 1 );
 						else
 							bs2b_cross_feed_s16be( bs2bdp, sample, 1 );
 					}
@@ -208,7 +223,7 @@ int main( int argc, char *argv[] )
 				case 'l':
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s16le( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u16le( bs2bdp, sample, 1 );
 						else
 							bs2b_cross_feed_s16le( bs2bdp, sample, 1 );
 					}
@@ -217,7 +232,7 @@ int main( int argc, char *argv[] )
 				default:
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s16( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u16( bs2bdp, sample, 1 );
 						else
 							bs2b_cross_feed_s16( bs2bdp, sample, 1 );
 					}
@@ -239,7 +254,7 @@ int main( int argc, char *argv[] )
 				case 'b':
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s24be( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u24be( bs2bdp, ( bs2b_uint24_t * )sample, 1 );
 						else
 							bs2b_cross_feed_s24be( bs2bdp, sample, 1 );
 					}
@@ -248,7 +263,7 @@ int main( int argc, char *argv[] )
 				case 'l':
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s24le( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u24le( bs2bdp, ( bs2b_uint24_t * )sample, 1 );
 						else
 							bs2b_cross_feed_s24le( bs2bdp, sample, 1 );
 					}
@@ -257,7 +272,7 @@ int main( int argc, char *argv[] )
 				default:
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s24( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u24( bs2bdp, ( bs2b_uint24_t * )sample, 1 );
 						else
 							bs2b_cross_feed_s24( bs2bdp, sample, 1 );
 					}
@@ -279,7 +294,7 @@ int main( int argc, char *argv[] )
 				case 'b':
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s32be( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u32be( bs2bdp, sample, 1 );
 						else
 							bs2b_cross_feed_s32be( bs2bdp, sample, 1 );
 					}
@@ -288,7 +303,7 @@ int main( int argc, char *argv[] )
 				case 'l':
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s32le( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u32le( bs2bdp, sample, 1 );
 						else
 							bs2b_cross_feed_s32le( bs2bdp, sample, 1 );
 					}
@@ -297,7 +312,7 @@ int main( int argc, char *argv[] )
 				default:
 					{
 						if( unsigned_flag )
-							bs2b_cross_feed_s32( bs2bdp, sample, 1 ); /* ***!!!*** s -> u */
+							bs2b_cross_feed_u32( bs2bdp, sample, 1 );
 						else
 							bs2b_cross_feed_s32( bs2bdp, sample, 1 );
 					}
diff --git a/win32/examples/bs2b.bat b/win32/examples/bs2b.bat
index 89541b5..03c123f 100644
--- a/win32/examples/bs2b.bat
+++ b/win32/examples/bs2b.bat
@@ -1,7 +1,7 @@
 @echo off

 

 set BS2B="C:\Program Files\bs2b\bs2bconvert.exe"

-set BS2BOPT=-6

+set BS2BOPT=-c

 

 set BC=%BS2B% %BS2BOPT%

 

diff --git a/win32/examples/bs2bwav.bat b/win32/examples/bs2bwav.bat
index 35ee51d..ec3cf57 100644
--- a/win32/examples/bs2bwav.bat
+++ b/win32/examples/bs2bwav.bat
@@ -9,7 +9,7 @@ rem
 set TMPDR=C:\temp\bs2b

 

 set BS2B=C:\"\Program Files\"\bs2b\bs2bconvert.exe

-set BS2BOPT=-2

+set BS2BOPT=-c

 

 set UFIND=C:\Program Files\UnxUtils\find.exe

 set UFINDOPT=-name *.wav -exec cmd /c %BS2B% %BS2BOPT% \"{}\" \"%TMPDR%\{}\" ;

diff --git a/win32/examples/mp3bs2bmp3.bat b/win32/examples/mp3bs2bmp3.bat
index bfdd9e8..482b387 100644
--- a/win32/examples/mp3bs2bmp3.bat
+++ b/win32/examples/mp3bs2bmp3.bat
@@ -5,7 +5,7 @@ set BS2B="C:\Program Files\bs2b\bs2bconvert.exe"
 

 set LAMEDECODEOPT=--decode

 set LAMEENCODEOPT=--preset standard --tc bs2b

-set BS2BOPT=-6

+set BS2BOPT=-c

 

 set TW=tmpfile.wav

 set TWB=tmpfile-bs2b.wav