From e2de64d6f1beb9e492daf5b886e19933c1fa41dd Mon Sep 17 00:00:00 2001 From: toma Date: Wed, 25 Nov 2009 17:56:58 +0000 Subject: Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features. BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslave/audiocd/plugins/wav/Makefile.am | 15 +++++ kioslave/audiocd/plugins/wav/encodercda.cpp | 67 +++++++++++++++++++++++ kioslave/audiocd/plugins/wav/encodercda.h | 61 +++++++++++++++++++++ kioslave/audiocd/plugins/wav/encoderwav.cpp | 85 +++++++++++++++++++++++++++++ kioslave/audiocd/plugins/wav/encoderwav.h | 56 +++++++++++++++++++ 5 files changed, 284 insertions(+) create mode 100644 kioslave/audiocd/plugins/wav/Makefile.am create mode 100644 kioslave/audiocd/plugins/wav/encodercda.cpp create mode 100644 kioslave/audiocd/plugins/wav/encodercda.h create mode 100644 kioslave/audiocd/plugins/wav/encoderwav.cpp create mode 100644 kioslave/audiocd/plugins/wav/encoderwav.h (limited to 'kioslave/audiocd/plugins/wav') diff --git a/kioslave/audiocd/plugins/wav/Makefile.am b/kioslave/audiocd/plugins/wav/Makefile.am new file mode 100644 index 00000000..82e6ab28 --- /dev/null +++ b/kioslave/audiocd/plugins/wav/Makefile.am @@ -0,0 +1,15 @@ +AM_CPPFLAGS = -I$(srcdir)/.. $(all_includes) + +INCLUDES = -I$(top_srcdir)/libkcddb + +kde_module_LTLIBRARIES = libaudiocd_encoder_wav.la + +libaudiocd_encoder_wav_la_SOURCES = encoderwav.cpp encodercda.cpp + +libaudiocd_encoder_wav_la_LIBADD = $(LIB_KIO) ../libaudiocdplugins.la $(CDPARANOIA_LIBS) + +libaudiocd_encoder_wav_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + +pluginsdir = $(kde_datadir)/audiocd/plugins + +METASOURCES = AUTO diff --git a/kioslave/audiocd/plugins/wav/encodercda.cpp b/kioslave/audiocd/plugins/wav/encodercda.cpp new file mode 100644 index 00000000..fb8a794a --- /dev/null +++ b/kioslave/audiocd/plugins/wav/encodercda.cpp @@ -0,0 +1,67 @@ +/* + Copyright (C) 2000 Rik Hemsley (rikkus) + Copyright (C) 2000, 2001, 2002 Michael Matz + Copyright (C) 2001 Carsten Duvenhorst + Copyright (C) 2001 Adrian Schroeter + Copyright (C) 2003 Richard Lärkäng + Copyright (C) 2003 Scott Wheeler + Copyright (C) 2004, 2005 Benjamin Meyer + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "encodercda.h" + +class EncoderCda::Private +{ + public: + +}; + +unsigned long EncoderCda::size(long time_secs) const { + //return (time_secs * (44100 * 2 * 16))/8; + return (time_secs) * 176400; +} + +const char * EncoderCda::mimeType() const { + return "audio/x-cda"; +} + +// Remove this by calculating CD_FRAMESIZE_RAW from the frames +extern "C" +{ + #include +} + +inline int16_t swap16 (int16_t i) +{ + return (((i >> 8) & 0xFF) | ((i << 8) & 0xFF00)); +} + +long EncoderCda::read(int16_t * buf, int frames){ + QByteArray output; + int16_t i16 = 1; + /* WAV is defined to be little endian, so we need to swap it + on big endian platforms. */ + if (((char*)&i16)[0] == 0) + for (int i=0; i < 2 * frames; i++) + buf[i] = swap16 (buf[i]); + char * cbuf = reinterpret_cast(buf); + output.setRawData(cbuf, CD_FRAMESIZE_RAW); + ioslave->data(output); + output.resetRawData(cbuf, CD_FRAMESIZE_RAW); + return CD_FRAMESIZE_RAW; +} + diff --git a/kioslave/audiocd/plugins/wav/encodercda.h b/kioslave/audiocd/plugins/wav/encodercda.h new file mode 100644 index 00000000..0a95aa51 --- /dev/null +++ b/kioslave/audiocd/plugins/wav/encodercda.h @@ -0,0 +1,61 @@ +/* + Copyright (C) 2000 Rik Hemsley (rikkus) + Copyright (C) 2000, 2001, 2002 Michael Matz + Copyright (C) 2001 Carsten Duvenhorst + Copyright (C) 2001 Adrian Schroeter + Copyright (C) 2003 Richard Lärkäng + Copyright (C) 2003 Scott Wheeler + Copyright (C) 2004, 2005 Benjamin Meyer + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#ifndef ENCODER_CDA_H +#define ENCODER_CDA_H + +#include +#include +#include +#include + +/** + * Raw cd "encoder" + * Does little more then copy the data and make sure it is in the right + * endian. + */ +class EncoderCda : public AudioCDEncoder { + +public: + EncoderCda(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {}; + ~EncoderCda(){}; + virtual bool init(){ return true; }; + virtual void loadSettings(){}; + virtual unsigned long size(long time_secs) const; + virtual QString type() const { return "CDA"; }; + virtual const char * mimeType() const; + virtual const char * fileType() const { return "cda"; }; + virtual void fillSongInfo( KCDDB::CDInfo, int, const QString &){}; + virtual long readInit(long){ return 0; }; + virtual long read(int16_t * buf, int frames); + virtual long readCleanup(){ return 0; }; + +private: + class Private; + Private * d; + +}; + +#endif // ENCODER_CDA_H + diff --git a/kioslave/audiocd/plugins/wav/encoderwav.cpp b/kioslave/audiocd/plugins/wav/encoderwav.cpp new file mode 100644 index 00000000..ad658e2c --- /dev/null +++ b/kioslave/audiocd/plugins/wav/encoderwav.cpp @@ -0,0 +1,85 @@ +/* + Copyright (C) 2000 Rik Hemsley (rikkus) + Copyright (C) 2000, 2001, 2002 Michael Matz + Copyright (C) 2001 Carsten Duvenhorst + Copyright (C) 2001 Adrian Schroeter + Copyright (C) 2003 Richard Lärkäng + Copyright (C) 2003 Scott Wheeler + Copyright (C) 2004, 2005 Benjamin Meyer + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "encoderwav.h" + +extern "C" +{ + KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList &encoders) + { + encoders.append( new EncoderWav(slave)); + encoders.append( new EncoderCda(slave)); + } +} + +class EncoderWav::Private +{ + public: + +}; + +unsigned long EncoderWav::size(long time_secs) const { + return (EncoderCda::size(time_secs) + 44); +} + +const char * EncoderWav::mimeType() const { + return "audio/x-wav"; +} + +long EncoderWav::readInit(long byteCount){ + static char riffHeader[] = + { + 0x52, 0x49, 0x46, 0x46, // 0 "AIFF" + 0x00, 0x00, 0x00, 0x00, // 4 wavSize + 0x57, 0x41, 0x56, 0x45, // 8 "WAVE" + 0x66, 0x6d, 0x74, 0x20, // 12 "fmt " + 0x10, 0x00, 0x00, 0x00, // 16 + 0x01, 0x00, 0x02, 0x00, // 20 + 0x44, 0xac, 0x00, 0x00, // 24 + 0x10, 0xb1, 0x02, 0x00, // 28 + 0x04, 0x00, 0x10, 0x00, // 32 + 0x64, 0x61, 0x74, 0x61, // 36 "data" + 0x00, 0x00, 0x00, 0x00 // 40 byteCount + }; + + Q_INT32 wavSize(byteCount + 44 - 8); + + + riffHeader[4] = (wavSize >> 0 ) & 0xff; + riffHeader[5] = (wavSize >> 8 ) & 0xff; + riffHeader[6] = (wavSize >> 16) & 0xff; + riffHeader[7] = (wavSize >> 24) & 0xff; + + riffHeader[40] = (byteCount >> 0 ) & 0xff; + riffHeader[41] = (byteCount >> 8 ) & 0xff; + riffHeader[42] = (byteCount >> 16) & 0xff; + riffHeader[43] = (byteCount >> 24) & 0xff; + + QByteArray output; + output.setRawData(riffHeader, 44); + ioslave->data(output); + output.resetRawData(riffHeader, 44); + return 44; +} + diff --git a/kioslave/audiocd/plugins/wav/encoderwav.h b/kioslave/audiocd/plugins/wav/encoderwav.h new file mode 100644 index 00000000..09301ae5 --- /dev/null +++ b/kioslave/audiocd/plugins/wav/encoderwav.h @@ -0,0 +1,56 @@ +/* + Copyright (C) 2000 Rik Hemsley (rikkus) + Copyright (C) 2000, 2001, 2002 Michael Matz + Copyright (C) 2001 Carsten Duvenhorst + Copyright (C) 2001 Adrian Schroeter + Copyright (C) 2003 Richard Lärkäng + Copyright (C) 2003 Scott Wheeler + Copyright (C) 2004, 2005 Benjamin Meyer + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#ifndef ENCODER_WAV_H +#define ENCODER_WAV_H + +#include "encodercda.h" +#include +#include +#include + +/** + * Wav audio "encoder" + * Takes the CDA take and adds the standard wav header. + */ +class EncoderWav : public EncoderCda { + +public: + EncoderWav(KIO::SlaveBase *slave) : EncoderCda(slave) {}; + ~EncoderWav(){}; + virtual bool init(){ return true; }; + virtual unsigned long size(long time_secs) const; + virtual QString type() const { return "Wav"; }; + virtual const char * fileType() const { return "wav"; }; + virtual const char * mimeType() const; + virtual void fillSongInfo( KCDDB::CDInfo, int, const QString &){}; + virtual long readInit(long size); + +private: + class Private; + Private * d; + +}; + +#endif // ENCODER_WAV_H -- cgit v1.2.1