author | llornkcor <llornkcor> | 2002-03-18 01:56:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-18 01:56:12 (UTC) |
commit | 2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc (patch) (side-by-side diff) | |
tree | f14f5f50b091add26e880e6268bde46e836864af /core/applets | |
parent | c09cb25eb6bbf31bed0d4a415802469cfd1efedf (diff) | |
download | opie-2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc.zip opie-2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc.tar.gz opie-2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc.tar.bz2 |
added Portuguese translations from 'covarde_anonimo' on #opie
-rw-r--r-- | core/applets/batteryapplet/batteryapplet.pro | 1 | ||||
-rw-r--r-- | core/applets/clipboardapplet/clipboardapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/clockapplet/clockapplet.pro | 1 | ||||
-rw-r--r-- | core/applets/screenshotapplet/screenshotapplet.pro | 1 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 262 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.pro | 1 | ||||
-rw-r--r-- | core/applets/volumeapplet/volumeapplet.pro | 1 |
7 files changed, 164 insertions, 105 deletions
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro index dcb606d..d139e58 100644 --- a/core/applets/batteryapplet/batteryapplet.pro +++ b/core/applets/batteryapplet/batteryapplet.pro @@ -11,2 +11,3 @@ VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts +TRANSLATIONS = ../../i18n/pt_BR/libbatteryapplet.ts diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro index 9832984..f71c787 100644 --- a/core/applets/clipboardapplet/clipboardapplet.pro +++ b/core/applets/clipboardapplet/clipboardapplet.pro @@ -9,2 +9,4 @@ DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 + +TRANSLATIONS = ../../i18n/pt_BR/libclipboardapplet.ts diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro index 1392680..0397340 100644 --- a/core/applets/clockapplet/clockapplet.pro +++ b/core/applets/clockapplet/clockapplet.pro @@ -11,2 +11,3 @@ VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libclockapplet.ts +TRANSLATIONS = ../../i18n/pt_BR/libclockapplet.ts diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro index 095cce2..d03bacc 100644 --- a/core/applets/screenshotapplet/screenshotapplet.pro +++ b/core/applets/screenshotapplet/screenshotapplet.pro @@ -12,2 +12,3 @@ MOC_DIR=opieobj OBJECTS_DIR=opieobj +TRANSLATIONS = ../../i18n/pt_BR/libscreenshotapplet.ts diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 48dd193..9d69130 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -14,5 +14,5 @@ * $Id$ */ - +// Sun 03-17-2002 L.J.Potter <ljp@llornkcor.com> #include <sys/utsname.h> #include <sys/time.h> @@ -142,27 +142,22 @@ VMemo::VMemo( QWidget *parent, const char *name ) recording = FALSE; - myChannel = new QCopChannel( "QPE/VMemo", this ); - connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(receive(const QCString&, const QByteArray&)) ); - - struct utsname name; /* check for embedix kernel running on the zaurus, if - lineo change string, this break - */ - if (uname(&name) != -1) - { - QString release=name.release; - if(release.find("embedix",0,TRUE) !=-1) - systemZaurus=TRUE; - else - { - systemZaurus=FALSE; - - // Register the REC key press. - QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); - e << 4096; - e << QString("QPE/VMemo"); - e << QString("toggleRecord()"); - } - } + struct utsname name; /* check for embedix kernel running on the zaurus*/ + if (uname(&name) != -1) { + QString release=name.release; + 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&)) ); + +// // Register the REC key press, for ipaq only +// QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); +// e << 4096; +// e << QString("QPE/VMemo"); +// e << QString("toggleRecord()"); + } + } } @@ -175,10 +170,10 @@ void VMemo::receive( const QCString &msg, const QByteArray &data ) QDataStream stream( data, IO_ReadOnly ); if (msg == "toggleRecord()") - { - if (recording) - mouseReleaseEvent(NULL); - else - mousePressEvent(NULL); - } + { + if (recording) + mouseReleaseEvent(NULL); + else + mousePressEvent(NULL); + } } @@ -193,25 +188,25 @@ void VMemo::mousePressEvent( QMouseEvent *me ) // just to be safe if (recording) - { - recording = FALSE; - return; - } + { + recording = FALSE; + return; + } /* - No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions - mousePressEvent and mouseReleaseEvent with a NULL parameter. + No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions + mousePressEvent and mouseReleaseEvent with a NULL parameter. */ - if (!systemZaurus && me != NULL) - return; +// if (!systemZaurus && me != NULL) +// return; QSound::play(Resource::findSound("vmemob")); - + qDebug("Start recording"); recording = TRUE; if (openDSP() == -1) - { - QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); - recording = FALSE; - return; - } + { + QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); + recording = FALSE; + return; + } Config vmCfg("VMemo"); @@ -222,7 +217,7 @@ void VMemo::mousePressEvent( QMouseEvent *me ) if(systemZaurus) - fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs + fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs else - fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); + fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); fileName += "vm_"; @@ -237,12 +232,12 @@ void VMemo::mousePressEvent( QMouseEvent *me ) if(openWAV(fileName.latin1()) == -1) - { - QString err("Could not open the output file: "); - err += fileName; + { + QString err("Could not open the output file: "); + err += fileName; - QMessageBox::critical(0, "VMemo", err, "Abort"); - close(dsp); - return; - } + QMessageBox::critical(0, "VMemo", err, "Abort"); + close(dsp); + return; + } QArray<int> cats(1); @@ -273,49 +268,41 @@ int VMemo::openDSP() 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; - } + if (cfg.readNumEntry("SixteenBit", 1)==1) { + format = AFMT_S16_LE; + resolution = 16; + } +// else { +// format = AFMT_U8; +// resolution = 8; +// } - 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) - { + if(dsp == -1) { perror("open(\"/dev/dsp\")"); 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; @@ -325,6 +312,6 @@ int VMemo::openWAV(const char *filename) { track.setName(filename); - if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) - return -1; + if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) + return -1; wav=track.handle(); @@ -355,16 +342,79 @@ void VMemo::record(void) { int length=0, result, value; - char sound[512]; + qDebug("Recording"); + + if(format==AFMT_S16_LE) { + signed short sound[512], monoBuffer[512]; + while(recording) { + result = read(dsp, sound, 512); // 8192 + qApp->processEvents(); + int j=0; + if(systemZaurus) { + for (int i = 0; i < result; i++) { //since Z is mono do normally + monoBuffer[i] = sound[i]; + } + qApp->processEvents(); + 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++; + } + qApp->processEvents(); + length+=write(wav, monoBuffer, result/2); + } + printf("%d\r",length); + fflush(stdout); + } + } + // else { //AFMT_U8 // don't try this yet.. as player doesn't understand +// 8bit unsigned + // unsigned short sound[512], monoBuffer[512]; +// while(recording) +// { +// result = read(dsp, sound, 512); // 8192 +// qApp->processEvents(); +// int j=0; +// if(systemZaurus) +// { +// for (int i = 0; i < result; i++) { //since Z is mono do normally +// monoBuffer[i] = sound[i]; +// } +// qApp->processEvents(); +// 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++; +// } +// qApp->processEvents(); +// length+=write(wav, monoBuffer, result/2); +// } +// // length += result; +// printf("%d\r",length); +// fflush(stdout); + +// qApp->processEvents(); +// } +// } + + - while(recording) - { - result = read(dsp, sound, 512); // 8192 - qApp->processEvents(); +// char sound[512]; //char is 8 bit + +// while(recording) +// { +// result = read(dsp, sound, 512); // 8192 +// qApp->processEvents(); - write(wav, sound, result); - length += result; +// write(wav, sound, result); +// length += result; - qApp->processEvents(); - } +// qApp->processEvents(); +// } +// qDebug("file has length of %d lasting %d seconds", +// length, (( length / speed) / channels) / 2 ); +// medialplayer states wrong length in secs + value = length+36; @@ -376,6 +426,8 @@ void VMemo::record(void) if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) - perror("ioctl(\"SNDCTL_DSP_RESET\")"); + perror("ioctl(\"SNDCTL_DSP_RESET\")"); ::close(dsp); +// if(systemZaurus) + QMessageBox::message("Vmemo"," Done recording"); QSound::play(Resource::findSound("vmemoe")); diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro index bf9af4b..29f99fb 100644 --- a/core/applets/vmemo/vmemo.pro +++ b/core/applets/vmemo/vmemo.pro @@ -10,2 +10,3 @@ LIBS += -lqpe VERSION = 1.0.0 +TRANSLATIONS = ../../i18n/pt_BR/libvmemoapplet.ts diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index fedaed7..c5b764b 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro @@ -11,2 +11,3 @@ VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts +TRANSLATIONS = ../../i18n/pt_BR/libvolumeapplet.ts |