From f3aa76578638116c92652e37b57075850ee17dd3 Mon Sep 17 00:00:00 2001 From: llornkcor Date: Sun, 23 Jun 2002 03:12:26 +0000 Subject: error checking --- diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 7021fae..e25a1ab 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -1,14 +1,14 @@ /************************************************************************************ -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -************************************************************************************/ + ** + ** This file may be distributed and/or modified under the terms of the + ** GNU General Public License version 2 as published by the Free Software + ** Foundation and appearing in the file LICENSE.GPL included in the + ** packaging of this file. + ** + ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + ** + ************************************************************************************/ // copyright 2002 Jeremy Cowgar /* * $Id$ @@ -73,164 +73,165 @@ int seq = 0; /* XPM */ static char * vmemo_xpm[] = { -"16 16 102 2", -" c None", -". c #60636A", -"+ c #6E6E72", -"@ c #68696E", -"# c #4D525C", -"$ c #6B6C70", -"% c #E3E3E8", -"& c #EEEEF2", -"* c #EAEAEF", -"= c #CACAD0", -"- c #474A51", -"; c #171819", -"> c #9B9B9F", -", c #EBEBF0", -"' c #F4F4F7", -") c #F1F1F5", -"! c #DEDEE4", -"~ c #57575C", -"{ c #010101", -"] c #A2A2A6", -"^ c #747477", -"/ c #B5B5B8", -"( c #AEAEB2", -"_ c #69696D", -": c #525256", -"< c #181C24", -"[ c #97979B", -"} c #A7A7AC", -"| c #B0B0B4", -"1 c #C8C8D1", -"2 c #75757B", -"3 c #46464A", -"4 c #494A4F", -"5 c #323234", -"6 c #909095", -"7 c #39393B", -"8 c #757578", -"9 c #87878E", -"0 c #222224", -"a c #414144", -"b c #6A6A6E", -"c c #020C16", -"d c #6B6B6F", -"e c #68686D", -"f c #5B5B60", -"g c #8A8A8F", -"h c #6B6B6E", -"i c #ADADB2", -"j c #828289", -"k c #3E3E41", -"l c #CFCFD7", -"m c #4C4C50", -"n c #000000", -"o c #66666A", -"p c #505054", -"q c #838388", -"r c #A1A1A7", -"s c #A9A9AE", -"t c #A8A8B0", -"u c #5E5E63", -"v c #3A3A3E", -"w c #BDBDC6", -"x c #59595E", -"y c #76767C", -"z c #373738", -"A c #717174", -"B c #727278", -"C c #1C1C1E", -"D c #3C3C3F", -"E c #ADADB6", -"F c #54555A", -"G c #8B8C94", -"H c #5A5A5F", -"I c #BBBBC3", -"J c #C4C4CB", -"K c #909098", -"L c #737379", -"M c #343437", -"N c #8F8F98", -"O c #000407", -"P c #2D3137", -"Q c #B0B1BC", -"R c #3B3C40", -"S c #6E6E74", -"T c #95959C", -"U c #74747A", -"V c #1D1D1E", -"W c #91929A", -"X c #42444A", -"Y c #22282E", -"Z c #B0B2BC", -"` c #898A90", -" . c #65656A", -".. c #999AA2", -"+. c #52535A", -"@. c #151B21", -"#. c #515257", -"$. c #B5B5BE", -"%. c #616167", -"&. c #1A1D22", -"*. c #000713", -"=. c #1F1F21", -" ", -" . + @ # ", -" $ % & * = - ", -" ; > , ' ) ! ~ ", -" { ] ^ / ( _ : ", -" < [ } | 1 2 3 ", -" 4 5 6 7 8 9 0 a b c ", -" d e f g h i j 3 k l m n ", -" o p q r s t u v w n ", -" o x y z A B C D E n ", -" F G H I J K L M N O ", -" P Q R S T U V W X ", -" Y Z ` b ...+. ", -" @.#.$.%.&. ", -" *.B =. ", -" n n n n n n n n n "}; + "16 16 102 2", + " c None", + ". c #60636A", + "+ c #6E6E72", + "@ c #68696E", + "# c #4D525C", + "$ c #6B6C70", + "% c #E3E3E8", + "& c #EEEEF2", + "* c #EAEAEF", + "= c #CACAD0", + "- c #474A51", + "; c #171819", + "> c #9B9B9F", + ", c #EBEBF0", + "' c #F4F4F7", + ") c #F1F1F5", + "! c #DEDEE4", + "~ c #57575C", + "{ c #010101", + "] c #A2A2A6", + "^ c #747477", + "/ c #B5B5B8", + "( c #AEAEB2", + "_ c #69696D", + ": c #525256", + "< c #181C24", + "[ c #97979B", + "} c #A7A7AC", + "| c #B0B0B4", + "1 c #C8C8D1", + "2 c #75757B", + "3 c #46464A", + "4 c #494A4F", + "5 c #323234", + "6 c #909095", + "7 c #39393B", + "8 c #757578", + "9 c #87878E", + "0 c #222224", + "a c #414144", + "b c #6A6A6E", + "c c #020C16", + "d c #6B6B6F", + "e c #68686D", + "f c #5B5B60", + "g c #8A8A8F", + "h c #6B6B6E", + "i c #ADADB2", + "j c #828289", + "k c #3E3E41", + "l c #CFCFD7", + "m c #4C4C50", + "n c #000000", + "o c #66666A", + "p c #505054", + "q c #838388", + "r c #A1A1A7", + "s c #A9A9AE", + "t c #A8A8B0", + "u c #5E5E63", + "v c #3A3A3E", + "w c #BDBDC6", + "x c #59595E", + "y c #76767C", + "z c #373738", + "A c #717174", + "B c #727278", + "C c #1C1C1E", + "D c #3C3C3F", + "E c #ADADB6", + "F c #54555A", + "G c #8B8C94", + "H c #5A5A5F", + "I c #BBBBC3", + "J c #C4C4CB", + "K c #909098", + "L c #737379", + "M c #343437", + "N c #8F8F98", + "O c #000407", + "P c #2D3137", + "Q c #B0B1BC", + "R c #3B3C40", + "S c #6E6E74", + "T c #95959C", + "U c #74747A", + "V c #1D1D1E", + "W c #91929A", + "X c #42444A", + "Y c #22282E", + "Z c #B0B2BC", + "` c #898A90", + " . c #65656A", + ".. c #999AA2", + "+. c #52535A", + "@. c #151B21", + "#. c #515257", + "$. c #B5B5BE", + "%. c #616167", + "&. c #1A1D22", + "*. c #000713", + "=. c #1F1F21", + " ", + " . + @ # ", + " $ % & * = - ", + " ; > , ' ) ! ~ ", + " { ] ^ / ( _ : ", + " < [ } | 1 2 3 ", + " 4 5 6 7 8 9 0 a b c ", + " d e f g h i j 3 k l m n ", + " o p q r s t u v w n ", + " o x y z A B C D E n ", + " F G H I J K L M N O ", + " P Q R S T U V W X ", + " Y Z ` b ...+. ", + " @.#.$.%.&. ", + " *.B =. ", + " n n n n n n n n n "}; VMemo::VMemo( QWidget *parent, const char *_name ) - : QWidget( parent, _name ) + : QWidget( parent, _name ) { - setFixedHeight( 18 ); - setFixedWidth( 14 ); + setFixedHeight( 18 ); + setFixedWidth( 14 ); - recording = FALSE; + recording = FALSE; - struct utsname name; /* check for embedix kernel running on the zaurus*/ - if (uname(&name) != -1) { - QString release=name.release; - Config vmCfg("Vmemo"); - vmCfg.setGroup("Defaults"); - int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); - - qDebug("toggleKey %d", toggleKey); - - if(release.find("embedix",0,TRUE) !=-1) - systemZaurus=TRUE; - else - systemZaurus=FALSE; + struct utsname name; /* check for embedix kernel running on the zaurus*/ + if (uname(&name) != -1) { + QString release=name.release; + Config vmCfg("Vmemo"); + vmCfg.setGroup("Defaults"); + int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); + + qDebug("toggleKey %d", toggleKey); + + if(release.find("embedix",0,TRUE) !=-1) + systemZaurus=TRUE; + else + systemZaurus=FALSE; - myChannel = new QCopChannel( "QPE/VMemo", this ); - connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(receive(const QCString&, const QByteArray&)) ); - - if( toggleKey != -1 ) { - QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); -// e << 4096; // Key_Escape -// e << Key_F5; //4148 - e << toggleKey; - e << QString("QPE/VMemo"); - e << QString("toggleRecord()"); - } - if( vmCfg.readNumEntry("hideIcon",0) == 1 || toggleKey > 0) - hide(); + myChannel = new QCopChannel( "QPE/VMemo", this ); + connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) ); + + if( toggleKey != -1 ) { + // QPEApplication::grabKeyboard(); + QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); + // e << 4096; // Key_Escape + // e << Key_F5; //4148 + e << toggleKey; + e << QString("QPE/VMemo"); + e << QString("toggleRecord()"); } + // if( vmCfg.readNumEntry("hideIcon",0) == 1 || toggleKey > 0) + // hide(); + } } VMemo::~VMemo() @@ -239,16 +240,16 @@ VMemo::~VMemo() void VMemo::receive( const QCString &msg, const QByteArray &data ) { - QDataStream stream( data, IO_ReadOnly ); - if (msg == "toggleRecord()") { - if (recording) { - fromToggle = TRUE; - stopRecording(); - } else { - fromToggle = TRUE; - startRecording(); - } + QDataStream stream( data, IO_ReadOnly ); + if (msg == "toggleRecord()") { + if (recording) { + fromToggle = TRUE; + stopRecording(); + } else { + fromToggle = TRUE; + startRecording(); } + } } void VMemo::paintEvent( QPaintEvent* ) @@ -259,67 +260,69 @@ void VMemo::paintEvent( QPaintEvent* ) void VMemo::mousePressEvent( QMouseEvent * ) { - startRecording(); + startRecording(); } void VMemo::mouseReleaseEvent( QMouseEvent * ) { - stopRecording(); + stopRecording(); } bool VMemo::startRecording() { - if ( recording) - return FALSE;; - - Config config( "Vmemo" ); - config.setGroup( "System" ); - - useAlerts = config.readBoolEntry("Alert"); - if(useAlerts) { - - msgLabel = new QLabel( 0, "alertLabel" ); - msgLabel->setText("

VMemo-Recording"); - msgLabel->show(); - } - -// if(useAlerts) -// QMessageBox::message("VMemo","Really Record?");//) ==1) -// return; -// } else { - if (!systemZaurus ) - QSound::play(Resource::findSound("vmemob")); -// } - qDebug("Start recording"); - recording = TRUE; - if (openDSP() == -1) { - QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort"); - recording = FALSE; - return FALSE; - } + if ( recording) + return FALSE;; + + Config config( "Vmemo" ); + config.setGroup( "System" ); + + useAlerts = config.readBoolEntry("Alert"); + if(useAlerts) { + + msgLabel = new QLabel( 0, "alertLabel" ); + msgLabel->setText("

VMemo-Recording"); + msgLabel->show(); + } + + // if(useAlerts) + // QMessageBox::message("VMemo","Really Record?");//) ==1) + // return; + // } else { + // if (!systemZaurus ) + // QSound::play(Resource::findSound("vmemob")); + // } + qDebug("Start recording engines"); + recording = TRUE; + + if (openDSP() == -1) { + // QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort"); + // delete msgLabel; + recording = FALSE; + return FALSE; + } config.setGroup("Defaults"); QDateTime dt = QDateTime::currentDateTime(); QString fName; - config.setGroup( "System" ); - fName = QPEApplication::documentDir() ; + config.setGroup( "System" ); + fName = QPEApplication::documentDir() ; fileName = config.readEntry("RecLocation", fName); int s; s=fileName.find(':'); if(s) - fileName=fileName.right(fileName.length()-s-2); + fileName=fileName.right(fileName.length()-s-2); qDebug("filename will be "+fileName); - if( fileName.left(1).find('/') == -1) - fileName="/"+fileName; - if( fileName.right(1).find('/') == -1) - fileName+="/"; + if( fileName.left(1).find('/') == -1) + fileName="/"+fileName; + if( fileName.right(1).find('/') == -1) + fileName+="/"; fName = "vm_"+ dt.toString()+ ".wav"; fileName+=fName; - qDebug("filename is "+fileName); + qDebug("filename is "+fileName); // No spaces in the filename fileName.replace(QRegExp("'"),""); fileName.replace(QRegExp(" "),"_"); @@ -327,9 +330,9 @@ bool VMemo::startRecording() { fileName.replace(QRegExp(","),""); if(openWAV(fileName.latin1()) == -1) { - QString err("Could not open the output file\n"); - err += fileName; - QMessageBox::critical(0, "vmemo", err, "Abort"); + // QString err("Could not open the output file\n"); + // err += fileName; + // QMessageBox::critical(0, "vmemo", err, "Abort"); close(dsp); return FALSE; } @@ -348,70 +351,72 @@ bool VMemo::startRecording() { record(); + // delete msgLabel; return TRUE; } void VMemo::stopRecording() { recording = FALSE; if(useAlerts) - if( msgLabel) delete msgLabel; + if( msgLabel) delete msgLabel; } int VMemo::openDSP() { - Config cfg("Vmemo"); - cfg.setGroup("Record"); + Config cfg("Vmemo"); + cfg.setGroup("Record"); - speed = cfg.readNumEntry("SampleRate", 22050); - channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) - if (cfg.readNumEntry("SixteenBit", 1)==1) { - format = AFMT_S16_LE; - resolution = 16; - } else { - format = AFMT_U8; - resolution = 8; - } + speed = cfg.readNumEntry("SampleRate", 22050); + channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) + if (cfg.readNumEntry("SixteenBit", 1)==1) { + format = AFMT_S16_LE; + resolution = 16; + } else { + format = AFMT_U8; + resolution = 8; + } - qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); + qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); - if(systemZaurus) { - dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 - channels=1; //zaurus has one input channel - } else { - dsp = open("/dev/dsp", O_RDWR); - } + if(systemZaurus) { + dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 + channels=1; //zaurus has one input channel + } else { + dsp = open("/dev/dsp", O_RDWR); + } - if(dsp == -1) { - perror("open(\"/dev/dsp\")"); - errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); - return -1; - } + if(dsp == -1) { + perror("open(\"/dev/dsp\")"); + errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); + QMessageBox::critical(0, "vmemo", errorMsg, "Abort"); + return -1; + } - if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { - perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); - return -1; - } - if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { - perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); - return -1; - } - if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { - perror("ioctl(\"SNDCTL_DSP_SPEED\")"); - return -1; - } - if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { - perror("ioctl(\"SOUND_PCM_READ_RATE\")"); - return -1; - } + if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { + perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); + return -1; + } + if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { + perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); + return -1; + } + if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { + perror("ioctl(\"SNDCTL_DSP_SPEED\")"); + return -1; + } + if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { + perror("ioctl(\"SOUND_PCM_READ_RATE\")"); + return -1; + } - return 1; + return 1; } int VMemo::openWAV(const char *filename) { track.setName(filename); if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { - errorMsg=filename; + errorMsg=filename; return -1; } @@ -441,132 +446,172 @@ int VMemo::openWAV(const char *filename) void VMemo::record(void) { - int length=0, result, value; - QString msg; - msg.sprintf("Recording format %d", format); - qDebug(msg); - - if(systemZaurus) { - signed short sound[512], monoBuffer[512]; - if(format==AFMT_S16_LE) { - - while(recording) { - - result = read(dsp, sound, 512); // 8192 - int j=0; - - if(systemZaurus) { - for (int i = 0; i < result; i++) { //since Z is mono do normally - monoBuffer[i] = sound[i]; - } - - length+=write(wav, monoBuffer, result); - - } else { //ipaq /stereo inputs - - for (int i = 0; i < result; i+=2) { - monoBuffer[j] = (sound[i]+sound[i+1])/2; - j++; - } - - length+=write(wav, monoBuffer, result/2); - } - qApp->processEvents(); -// printf("%d\r",length); -// fflush(stdout); - } - } else { //AFMT_U8 -// 8bit unsigned - unsigned short sound[512], monoBuffer[512]; - while(recording) { - result = read(dsp, sound, 512); // 8192 - int j=0; - if(systemZaurus) { - for (int i = 0; i < result; i++) { //since Z is mono do normally - monoBuffer[i] = sound[i]; - } - length+=write(wav, monoBuffer, result); - } else { //ipaq /stereo inputs - for (int i = 0; i < result; i+=2) { - monoBuffer[j] = (sound[i]+sound[i+1])/2; - j++; - } - length+=write(wav, monoBuffer, result/2); - } - length += result; -// printf("%d\r",length); -// fflush(stdout); - } - - qApp->processEvents(); + int length=0, result, value; + QString msg; + msg.sprintf("Recording format %d", format); + qDebug(msg); + + if(systemZaurus) { + + msg.sprintf("Recording format zaurus"); + qDebug(msg); + signed short sound[512], monoBuffer[512]; + + if(format==AFMT_S16_LE) { + + while(recording) { + + result = read(dsp, sound, 512); // 8192 + int j=0; + + if(systemZaurus) { + for (int i = 0; i < result; i++) { //since Z is mono do normally + monoBuffer[i] = sound[i]; + } + + length+=write(wav, monoBuffer, result); + if(length<0) + recording=false; + + } else { //ipaq /stereo inputs + + + for (int i = 0; i < result; i+=2) { +/ monoBuffer[j] = sound[i]; + // monoBuffer[j] = (sound[i]+sound[i+1])/2; + + j++; + } + + length+=write(wav, monoBuffer, result); + if(length<0) + recording=false; + // length+=write(wav, monoBuffer, result/2); } + qApp->processEvents(); +// printf("%d\r",length); +// fflush(stdout); + } + +} else { //AFMT_U8 + // 8bit unsigned + unsigned short sound[512], monoBuffer[512]; + while(recording) { + result = read(dsp, sound, 512); // 8192 + int j=0; + + if(systemZaurus) { + + for (int i = 0; i < result; i++) { //since Z is mono do normally + monoBuffer[i] = sound[i]; + } + + length+=write(wav, monoBuffer, result); - } else { // this is specific for ipaqs that do not have 8 bit capabilities + } else { //ipaq /stereo inputs - signed short sound[512], monoBuffer[512]; + for (int i = 0; i < result; i+=2) { + monoBuffer[j] = (sound[i]+sound[i+1])/2; + j++; + } - while(recording) { - result = read(dsp, sound, 512); // 8192 - write(wav, sound, result); - length += result; + length+=write(wav, monoBuffer, result/2); + + if(length<0) + recording=false; - qApp->processEvents(); } -// printf("%d\r",length); -// fflush(stdout); - // qDebug("file has length of %d lasting %d seconds", - // length, (( length / speed) / channels) / 2 ); - // medialplayer states wrong length in secs + length += result; +// printf("%d\r",length); +// fflush(stdout); + } + + qApp->processEvents(); } - value = length+36; - lseek(wav, 4, SEEK_SET); - write(wav, &value, 4); - lseek(wav, 40, SEEK_SET); - write(wav, &length, 4); - track.close(); + } else { // this is specific for ipaqs that do not have 8 bit capabilities + + msg.sprintf("Recording format other"); + qDebug(msg); + + signed short sound[512], monoBuffer[512]; + + while(recording) { + + result = read(dsp, sound, 512); // 8192 + + write(wav, sound, result); + length += result; + if(length<0) { + + recording=false; + perror("dev/dsp's is a lookin' messy"); + QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); + } +// printf("%d\r",length); +// fflush(stdout); + qApp->processEvents(); + } + // qDebug("file has length of %d lasting %d seconds", + // length, (( length / speed) / channels) / 2 ); + // medialplayer states wrong length in secs + } + + //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<addRef(); - return QS_OK; + if ( *iface ) + (*iface)->addRef(); + return QS_OK; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( VMemoAppletImpl ) -} + } -- cgit v0.9.0.2