diff -ur tapiir-0.7.1/src/MTD.hxx tapiir-0.7.1-gentoo/src/MTD.hxx --- tapiir-0.7.1/src/MTD.hxx 2003-02-22 06:06:16.000000000 +1300 +++ tapiir-0.7.1-gentoo/src/MTD.hxx 2003-10-11 21:29:57.000000000 +1300 @@ -28,7 +28,7 @@ /**** the following might be specialized for specific data types ****/ float FromGain(const T& g) const { return (float) g; } T ToGain(const float& v) const { return (T) v; } - void MulAdj( T& i ) const { } + void MulAdj( T& i ) const { } void Clip( T&) const {} public: @@ -193,22 +193,22 @@ /****************************** specializations ******************************/ -float MTD::FromGain(const int& g) const { return float(g)/256.; } -float MTD::FromGain(const int& g) const { return float(g)/256.; } +inline float MTD::FromGain(const int& g) const { return float(g)/256.; } +inline float MTD::FromGain(const int& g) const { return float(g)/256.; } -int MTD::ToGain(const float& f) const { return (int)(f*256.); } -int MTD::ToGain(const float& f) const { return (int)(f*256.); } +inline int MTD::ToGain(const float& f) const { return (int)(f*256.); } +inline int MTD::ToGain(const float& f) const { return (int)(f*256.); } -void MTD::Clip( float& f) const +inline void MTD::Clip( float& f) const { if (f>32767.) f = 32767.; else if (f<-32767.) f = -32767.; } -void MTD::Clip( int& i) const +inline void MTD::Clip( int& i) const { if (i>32767) i = 32767; else if (i<-32767) i = -32767; } -void MTD::Clip( float& f) const +inline void MTD::Clip( float& f) const { if (f>1.) f = 1.; else if (f<-1.) f = -1.; } -void MTD::MulAdj( int& i) const { i>>=8; } -void MTD::MulAdj( int& i) const { i>>=8; } +inline void MTD::MulAdj( int& i) const { i>>=8; } +inline void MTD::MulAdj( int& i) const { i>>=8; } /*****************************************************************************/ diff -ur tapiir-0.7.1/src/alsaio.cxx tapiir-0.7.1-gentoo/src/alsaio.cxx --- tapiir-0.7.1/src/alsaio.cxx 2003-02-26 02:24:24.000000000 +1300 +++ tapiir-0.7.1-gentoo/src/alsaio.cxx 2003-10-06 20:35:48.000000000 +1300 @@ -402,18 +402,17 @@ { int k; //-c,--channels channels default %d - printf("\ -Usage: %s [OPTION]... --h,--help help --P,--pdevice playback device default %s --C,--cdevice capture device default %s --m,--min minimum latency in frames default %d --M,--max maximum latency in frames default %d --r,--rate rate default %d --b,--block block mode default: %s --t,--time maximal tick time in us --p,--poll use poll (wait for event - reduces CPU usage) default: %s -", + printf("\n" +"Usage: %s [OPTION]...\n" +"-h,--help help\n" +"-P,--pdevice playback device default %s\n" +"-C,--cdevice capture device default %s\n" +"-m,--min minimum latency in frames default %d\n" +"-M,--max maximum latency in frames default %d\n" +"-r,--rate rate default %d\n" +"-b,--block block mode default: %s\n" +"-t,--time maximal tick time in us\n" +"-p,--poll use poll (wait for event - reduces CPU usage) default: %s\n", program, pdevice,cdevice, latency_min,latency_max,channels,rate,block?"on":"off",use_poll?"on":"off" diff -ur tapiir-0.7.1/src/jackio.cxx tapiir-0.7.1-gentoo/src/jackio.cxx --- tapiir-0.7.1/src/jackio.cxx 2003-02-26 02:24:53.000000000 +1300 +++ tapiir-0.7.1-gentoo/src/jackio.cxx 2003-10-06 20:22:05.000000000 +1300 @@ -60,13 +60,12 @@ static void help(char* program) { int k; - printf("\ -Usage: %s [OPTION]... --h,--help help --C,--cconnect jack-connect to capture client default none --P,--pconnect jack-connect to playback client default none --a,--alsaconnect jack-connect to alsa_pcm -", + printf("\n" +"Usage: %s [OPTION]...\n" +"-h,--help help\n" +"-C,--cconnect jack-connect to capture client default none\n" +"-P,--pconnect jack-connect to playback client default none\n" +"-a,--alsaconnect jack-connect to alsa_pcm\n", program ); }