whoops

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index fb2d819..e3385cd 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -1,589 +1,589 @@
 /****************************************************************************
 	 // qtrec.cpp
  Created: Thu Jan 17 11:19:58 2002
  copyright 2002 by L.J. Potter <ljp@llornkcor.com>
 ****************************************************************************/
 #define DEV_VERSION
 
 #include "pixmaps.h"
 #include "qtrec.h"
 #include "waveform.h"
 extern "C" {
 #include "adpcm.h"
 }
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qslider.h>
 #include <qtabwidget.h>
 #include <qtimer.h>
 
 /* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <math.h>
 #include <mntent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <sys/signal.h>
 #include <pthread.h>
 
 #ifdef PDAUDIO //ALSA
 #include <alsa/asoundlib.h>
 static int deviceSampleRates[8] = { 32000, 44100, 48000, 88200, 96000, 176400, 192000, -1 };
 static int deviceBitRates[] = { 8, 16, 24, 32, -1 };
 #else //OSS
 static int deviceSampleRates[6] = { 11025, 16000, 22050, 32000, 44100, -1 };
 static int deviceBitRates[] = { 8, 16, -1 };
 #endif
 
 #if defined(QT_QWS_SL5XXX)
 ///#if defined(QT_QWS_EBX)
 
 #define DSPSTROUT "/dev/dsp"
 #define DSPSTRIN "/dev/dsp1"
 #define DSPSTRMIXEROUT "/dev/mixer"
 #define DSPSTRMIXERIN "/dev/mixer1"
 
 #else
 
-#define DSPSTROUT "/dev/dsp1"
-#define DSPSTRIN "/dev/dsp1"
+#define DSPSTROUT "/dev/dsp"
+#define DSPSTRIN "/dev/dsp"
 #define DSPSTRMIXERIN "/dev/mixer"
 #define DSPSTRMIXEROUT "/dev/mixer"
 
 #endif
 
 //#define ZAURUS 0
 struct adpcm_state encoder_state;
 struct adpcm_state decoder_state;
 
 typedef struct {
 		int sampleRate;
 			/*      int fragSize; */
 			/*      int blockSize; */
 		int resolution; //bitrate
 		int channels; //number of channels
 		int fd; //file descriptor
 		int sd; //sound device descriptor
 		int numberSamples; //total number of samples
 		int SecondsToRecord; // number of seconds that should be recorded
 		float numberOfRecordedSeconds; //total number of samples recorded
 		int samplesToRecord; //number of samples to be recorded
 		int inVol; //input volume
 		int outVol; //output volume
 		int format; //wavfile format PCM.. ADPCM
 		const  char *fileName; //name of fiel to be played/recorded
 } fileParameters;
 
 fileParameters filePara;
 
 bool monitoring, recording, playing;
 bool stopped;
 QLabel *timeLabel;
 QSlider *timeSlider;
 int sd;
 
 Waveform* waveform;
 Device *soundDevice;
 
 
 #ifdef THREADED
 void quickRec()
 #else
 		void QtRec::quickRec()
 #endif
 {
 
 		odebug << ( filePara.numberSamples/filePara.sampleRate * filePara.channels ) << oendl;
 		odebug << "samples " << filePara.numberSamples << ", rate " << filePara.sampleRate
 					 << ", channels " << filePara.channels << oendl;
 
 		int total = 0;  // Total number of bytes read in so far.
 		int bytesWritten, number;
 
 		bytesWritten = 0;
 		number = 0;
 		QString num;
 		int level = 0;
 		int threshold = 0;
    int bits = filePara.resolution;
    odebug << "bits " << bits << "" << oendl;
 
 		if( filePara.resolution == 16 ) { //AFMT_S16_LE)
        odebug << "AFMT_S16_LE size " << filePara.SecondsToRecord << "" << oendl;
        odebug << "samples to record " << filePara.samplesToRecord << "" << oendl;
        odebug << "" << filePara.sd << "" << oendl;
 				level = 7;
 				threshold = 0;
 
 				if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
           odebug << "start recording WAVE_FORMAT_DVI_ADPCM" << oendl;
 // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_DVI_ADPCM  >>>>>>>>>>>>>>>>>>>>>>
 						char abuf[ BUFSIZE/2 ];
 						short sbuf[ BUFSIZE ];
 						short sbuf2[ BUFSIZE ];
 						memset( abuf, 0, BUFSIZE/2);
 						memset( sbuf, 0, BUFSIZE);
 						memset( sbuf2, 0, BUFSIZE);
 
 						for(;;) {
 								if ( stopped) {
 										odebug << "quickRec:: stopped" << oendl;
 										break;
 								}
 
 //             number=::read( filePara.sd, sbuf, BUFSIZE);
 								number =  soundDevice->devRead( filePara.sd, sbuf, BUFSIZE);
 
 								if(number <= 0) {
 										perror("recording error ");
 										odebug << "" << filePara.fileName << " " << number << "" << oendl;
 										stopped = true;
 										return;
 								}
 									//if(stereo == 2) {
 //        adpcm_coder( sbuf2, abuf, number/2, &encoder_state);
 								adpcm_coder( sbuf, abuf, number/2, &encoder_state);
 
 								bytesWritten = ::write( filePara.fd , (short *)abuf, number/4);
 
 								waveform->newSamples( sbuf, number );
 
 								total += bytesWritten;
 								filePara.numberSamples = total;
 								timeSlider->setValue( total);
 
          printf("%d, bytes %d,total %d\r",number, bytesWritten, total);
          fflush(stdout);
 
 				 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2	/ filePara.channels;
 
 								qApp->processEvents();
 								if( total >= filePara.samplesToRecord) {
 										stopped = true;
 										break;
 								}
 						}
 				} else {
 							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
 						odebug << "start recording WAVE_FORMAT_PCM" << oendl;
 						short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
 						memset( inbuffer, 0, BUFSIZE);
 						memset( outbuffer, 0, BUFSIZE);
 
 						for(;;) {
 								if ( stopped) {
 										odebug << "quickRec:: stopped" << oendl;
 										stopped = true;
 										break;  // stop if playing was set to false
 										return;
 								}
 
 								number = soundDevice->devRead( soundDevice->sd /*filePara.sd*/, (short *)inbuffer, BUFSIZE);
 
 								if( number <= 0) {
 										perror( "recording error ");
 										odebug << filePara.fileName << oendl;
 										stopped = true;
 										return;
 								}
 
 								bytesWritten = ::write( filePara.fd , inbuffer, number);
 								waveform->newSamples( inbuffer, number );
 
 								if( bytesWritten < 0) {
 										perror("File writing error ");
 										stopped = true;
 										return;
 								}
 
 								total += bytesWritten;
 
 								filePara.numberSamples = total;
 
 								if( filePara.SecondsToRecord != 0)
 										timeSlider->setValue( total);
          printf("%d, bytes %d,total %d\r",number,  bytesWritten , total);
          fflush(stdout);
 
 								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate
 										/ (float)2/filePara.channels;
 								qApp->processEvents();
 
 								if( total >= filePara.samplesToRecord) {
 										stopped = true;
 										break;
 								}
 						}
 				} //end main loop
 
 		} else {
 // <<<<<<<<<<<<<<<<<<<<<<<   format = AFMT_U8;
 				unsigned char unsigned_inbuffer[ BUFSIZE ], unsigned_outbuffer[ BUFSIZE ];
 				memset( unsigned_inbuffer, 0, BUFSIZE);
 				memset( unsigned_outbuffer, 0, BUFSIZE);
 
 				for(;;) {
 						if ( stopped) {
 								odebug << "quickRec:: stopped" << oendl;
 								break;  // stop if playing was set to false
 						}
 
 						number = ::read( soundDevice->sd /*filePara.sd*/ , unsigned_inbuffer, BUFSIZE);
 						bytesWritten = ::write( filePara.fd , unsigned_inbuffer, number);
             waveform->newSamples( (const short *) unsigned_inbuffer, number );
 
 						if(bytesWritten < 0) {
 								stopped = true;
 								QMessageBox::message("Note","<p>There was a problem writing to the file</p>");
 								perror("File writing error ");
 								return;
 						}
 
 						total += bytesWritten;
 						filePara.numberSamples = total;
 							//             printf("%d, bytes %d,total %d \r",number,  bytesWritten , total);
 							//             fflush(stdout);
 						if( filePara.SecondsToRecord !=0)
 								timeSlider->setValue( total);
 
 						filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate;
 
 						qApp->processEvents();
 						if( total >= filePara.samplesToRecord) {
 								stopped = true;
 								break;
 						}
 				} //end main loop
 		}
 } /// END quickRec()
 
 
 #ifdef THREADED
 void playIt()
 #else
 		void QtRec::playIt()
 #endif
 {
 		int bytesWritten = 0;
 		int number = 0;
 		int total = 0;  // Total number of bytes read in so far.
 		if( filePara.resolution == 16 ) { //AFMT_S16_LE) {
 				if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
 						char abuf[ BUFSIZE / 2 ];
 						short sbuf[ BUFSIZE ];
 						short sbuf2[ BUFSIZE * 2 ];
 						memset( abuf, 0, BUFSIZE / 2);
 						memset( sbuf, 0, BUFSIZE);
 						memset( sbuf2, 0, BUFSIZE * 2);
 // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_DVI_ADPCM  >>>>>>>>>>>>>>>>>>>>>>
 						for(;;) {  // play loop
 								if ( stopped) {
 										break;
 										return;
 								}// stop if playing was set to false
 
 								number = ::read( filePara.fd, abuf, BUFSIZE / 2);
 								adpcm_decoder( abuf, sbuf, number * 2, &decoder_state);
 
 //                 for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel
 //                     sbuf2[i+1]=sbuf2[i]=sbuf[i];
 //                 }
 								bytesWritten = write ( filePara.sd, sbuf, number * 4);
 								waveform->newSamples( (const short *)sbuf, number *4);
 									//          if(filePara.channels==1)
 									//              total += bytesWritten/2; //mono
 									//          else
 								total += bytesWritten;
 								filePara.numberSamples = total/4;
 								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / 2;
 
 								timeSlider->setValue( total/4);
 //            timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
 //         if(filePara.numberOfRecordedSeconds>1)
 //            timeLabel->setText( timeString+ tr(" seconds"));
 //                              printf("playing number %d, bytes %d, total %d\n",number,  bytesWritten, total/4);
 //                              fflush(stdout);
 
 								qApp->processEvents();
 
 								if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 //            if( total >= filePara.numberSamples ){//||  secCount > filePara.numberOfRecordedSeconds ) {
 										stopped = true;
 										break;
 								}
 						}
 				} else {
 							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
 						short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
 						memset( inbuffer, 0, BUFSIZE);
 						memset( outbuffer, 0, BUFSIZE);
 
 						for(;;) {  // play loop
 								if ( stopped) {
 										break;
 										return;
 								}
 // stop if playing was set to false
 								number = ::read( filePara.fd, inbuffer, BUFSIZE);
 //                 for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel
 //                       //        for (int i=0;i< number ; i++) { //2*i is left channel
 //                     outbuffer[i+1]= outbuffer[i]=inbuffer[i];
 //                 }
 								bytesWritten = ::write( filePara.sd, inbuffer, number);
 								waveform->newSamples( inbuffer, number);
 									//-------------->>>> out to device
 									//        total+=bytesWritten;
 									//          if(filePara.channels==1)
 									//              total += bytesWritten/2; //mono
 									//          else
 								total += bytesWritten;
 								timeSlider->setValue( total);
 
 								filePara.numberSamples = total;
 								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2;
 
 //             timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds);
 //             timeLabel->setText( timeString + tr(" seconds"));
 
 								qApp->processEvents();
 
 								if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 										owarn << "Jane! Stop this crazy thing!" << oendl;
 										stopped = true;
 //                playing = false;
 										break;
 								}
 						}
 //             printf("\nplaying number %d, bytes %d, total %d\r",number,  bytesWritten, total);
 //             fflush(stdout);
 				} //end loop
 		} else {
 /////////////////////////////// format = AFMT_U8;
 				unsigned char unsigned_inbuffer[ BUFSIZE ]; //, unsigned_outbuffer[BUFSIZE];
 				memset( unsigned_inbuffer, 0, BUFSIZE);
 				for(;;) {
 // main loop
 						if (stopped) {
 								break;  // stop if playing was set to false
 								return;
 						}
 						number = ::read( filePara.fd, unsigned_inbuffer, BUFSIZE);
 //data = (val >> 8) ^ 0x80;
 							//          unsigned_outbuffer = (unsigned_inbuffer >> 8) ^ 0x80;
 						bytesWritten = write ( filePara.sd, unsigned_inbuffer, number);
 						waveform->newSamples(  (const short *)unsigned_inbuffer, bytesWritten );
 						total += bytesWritten;
 
             timeSlider->setValue( total);
 						filePara.numberSamples = total;
 
 						filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate;
 //          timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds);
 //          timeLabel->setText( timeString + tr(" seconds"));
 						qApp->processEvents();
 
 						if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 //         if( total >= filePara.numberSamples ) {
 								stopped = true;
 								break;
 						}
 //                      printf("Writing number %d, bytes %d, total %d, numberSamples %d\r",number,  bytesWritten , total, filePara.numberSamples);
 //                      fflush(stdout);
 				}
 		}
 }
 
 
 QtRec::QtRec( QWidget* parent,  const char* name, WFlags fl )
 				: QWidget( parent, name, fl )
 {
 		if ( !name )
 				setName( "OpieRec" );
 		init();
 		initConfig();
 		initConnections();
 		renameBox = 0;
 
 // open sound device to get volumes
 		Config hwcfg("OpieRec");
 		hwcfg.setGroup("Hardware");
 
 
 		soundDevice = new Device( this,
 															hwcfg.readEntry( "Audio",DSPSTROUT),
 															hwcfg.readEntry( "Mixer",DSPSTRMIXEROUT), false);
 //      soundDevice = new Device( this, hwcfg.readEntry( "Audio","hw:0"), hwcfg.readEntry( "Mixer","hw:0"), false);
 
 //     soundDevice->setDeviceFormat(AFMT_S16_LE);
 //     soundDevice->setDeviceChannels(1);
 //     soundDevice->setDeviceRate( 22050);
 
 		getInVol();
 		getOutVol();
 
 		soundDevice->closeDevice( true);
 		soundDevice->sd = -1;
 		soundDevice = 0;
 		wavFile = 0;
 
 //      if( soundDevice) delete soundDevice;
 
 		initIconView();
 
 		if( autoMute)
 				doMute( true);
 		ListView1->setFocus();
 		playing = false;
 }
 
 QtRec::~QtRec() {
 //   if( soundDevice) delete soundDevice;
 
 }
 
 void QtRec::cleanUp() {
 
 		if( !stopped) {
 				stopped = true;
 				endRecording();
 		}
 
 		ListView1->clear();
 
 		if( autoMute)
 				doMute(false);
 
 //      if( wavFile) delete wavFile;
 // if(soundDevice) delete soundDevice;
 }
 
 void QtRec::init() {
 
 		needsStereoOut = false;
 		QPixmap image3( ( const char** ) image3_data );
 		QPixmap image4( ( const char** ) image4_data );
 		QPixmap image6( ( const char** ) image6_data );
 
 		stopped = true;
 		setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
 		QGridLayout *layout = new QGridLayout( this );
 		layout->setSpacing( 2);
 		layout->setMargin( 2);
 
 		TabWidget = new QTabWidget( this, "TabWidget" );
 		layout->addMultiCellWidget(TabWidget, 0, 7, 0, 8);
 //    TabWidget->setTabShape(QTabWidget::Triangular);
 
 			///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
 		tab = new QWidget( TabWidget, "tab" );
 
 		QGridLayout *layout1 = new QGridLayout( tab);
 		layout1->setSpacing( 2);
 		layout1->setMargin( 2);
 
 		timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" );
 		layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3);
 
 // 		timeLabel = new QLabel( tab, "TimeLabel" );
 // 		layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3);
 
 // 		playLabel2 = new QLabel(tab, "PlayLabel2" );
 // 		playLabel2->setText(tr("Play") );
 // 		playLabel2->setFixedHeight( 18);
 // 		layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4);
 
 		Stop_PushButton = new QPushButton(  tab, "Stop_PushButton" );
 		layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4);
 		Stop_PushButton->setFixedSize( 22, 22);
 		Stop_PushButton->setPixmap( image4 );
 
 		toBeginningButton = new QPushButton(  tab, "Beginning_PushButton" );
 		layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5);
 		toBeginningButton->setFixedSize( 22, 22);
 		toBeginningButton->setPixmap( Resource::loadPixmap("fastback") );
 
 		toEndButton = new QPushButton(  tab, "End_PushButton" );
 		layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6);
 		toEndButton->setFixedSize( 22, 22);
 		toEndButton->setPixmap(  Resource::loadPixmap( "fastforward" )  );
 
 // 		QLabel *recLabel2;
 // 		recLabel2 = new QLabel( tab, "recLabel2" );
 // 		recLabel2->setText(tr("Rec"));
 // 		recLabel2->setFixedHeight( 18);
 // 		layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7);
 
 		Rec_PushButton = new QPushButton( tab, "Rec_PushButton" );
 		layout1->addMultiCellWidget(  Rec_PushButton, 1, 1, 7, 7);
 		Rec_PushButton->setFixedSize( 22, 22);
 		Rec_PushButton->setPixmap( image6 );
 
 		t = new QTimer( this );
 		connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) );
 
 		rewindTimer = new QTimer( this );
 		connect( rewindTimer, SIGNAL( timeout() ),
 						 this, SLOT( rewindTimerTimeout() ) );
 
 		forwardTimer = new QTimer( this );
 		connect( forwardTimer, SIGNAL( timeout() ),
 						 this, SLOT( forwardTimerTimeout() ) );
 
 		deleteSoundButton  = new QPushButton( tab, "deleteSoundButton" );
 		layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8);
 		deleteSoundButton->setText( tr( "Del" ) );
 
 		ListView1 = new QListView( tab, "IconView1" );
 		layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8);
 
 		ListView1->addColumn( tr( "Name" ) );
 //		ListView1->setColumnWidth( 0, 140);
 		ListView1->setSorting( 1, false);
 		ListView1->addColumn( tr( "Time" ) ); //in seconds
 //		ListView1->setColumnWidth( 1, -1);
 // 		ListView1->addColumn( tr("Location") );
 // 		ListView1->setColumnWidth( 2, -1);
 // 		ListView1->addColumn( tr("Date") );
 // 		ListView1->setColumnWidth( 3, -1);
 		ListView1->setColumnWidthMode(0, QListView::Maximum);
 //		ListView1->setColumnWidthMode(1, QListView::Maximum);
 
 // 		ListView1->setColumnWidthMode( 0, QListView::Manual);
  		ListView1->setColumnAlignment( 1, QListView::AlignCenter);
 // 		ListView1->setColumnAlignment( 2, QListView::AlignRight);
 // 		ListView1->setColumnAlignment( 3, QListView::AlignLeft);
 		ListView1->setAllColumnsShowFocus( true );
 		QPEApplication::setStylusOperation( ListView1->viewport(), QPEApplication::RightOnHold);
 
 		TabWidget->insertTab( tab, tr( "Files" ) );
 
 			///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
 		tab_3 = new QWidget( TabWidget, "tab_3" );