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

8 files changed, 550 insertions, 0 deletions

diff --git a/audiofile_artsplugin/Makefile.am b/audiofile_artsplugin/Makefile.am
new file mode 100644
index 00000000..c5209797
--- /dev/null
+++ b/audiofile_artsplugin/Makefile.am
@@ -0,0 +1,23 @@
+INCLUDES= -I$(kde_includes)/arts $(all_includes)
+
+noinst_HEADERS = audiofilePlayObjectI.h
+
+lib_LTLIBRARIES = libarts_audiofile.la
+libarts_audiofile_la_COMPILE_FIRST = audiofilearts.h
+libarts_audiofile_la_SOURCES = audiofilearts.cc audiofilePlayObjectI.cpp
+libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined
+libarts_audiofile_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile
+libarts_audiofile_la_METASOURCES = AUTO
+
+audiofilearts.mcopclass: audiofilearts.h
+audiofilearts.mcoptype: audiofilearts.h
+audiofilearts.cc audiofilearts.h: $(srcdir)/audiofilearts.idl $(MCOPIDL)
+	$(MCOPIDL) -t -I$(kde_includes)/arts $(srcdir)/audiofilearts.idl
+
+mcoptypedir = $(libdir)/mcop
+mcoptype_DATA = audiofilearts.mcoptype audiofilearts.mcopclass
+
+mcopclassdir = $(libdir)/mcop/Arts
+mcopclass_DATA = audiofilePlayObject.mcopclass
+
+CLEANFILES=audiofilearts.h audiofilearts.cc audiofilearts.mcopclass audiofilearts.mcoptype
diff --git a/audiofile_artsplugin/README b/audiofile_artsplugin/README
new file mode 100644
index 00000000..8c25f5bf
--- /dev/null
+++ b/audiofile_artsplugin/README
@@ -0,0 +1,9 @@
+audiofilePlayObject by Neil Stevens <neil@qualityassistant.com>
+
+inspired by Alex Zepeda <zipzippy@sonic.net>
+
+based on the 7-line IRC explanation by Stefan Westerfeld <stefan@space.twc.de>
+
+uses audiofile by Michael Pruett <michael@68k.org>
+
+fiddled with by Rik Hemsley <rik@kde.org>
diff --git a/audiofile_artsplugin/audiofilePlayObject.mcopclass b/audiofile_artsplugin/audiofilePlayObject.mcopclass
new file mode 100644
index 00000000..f317002d
--- /dev/null
+++ b/audiofile_artsplugin/audiofilePlayObject.mcopclass
@@ -0,0 +1,7 @@
+Interface=Arts::audiofilePlayObject,Arts::PitchablePlayObject,Arts::PlayObject,Arts::SynthModule,Arts::Object
+Library=libarts_audiofile.la
+Language=C++
+Author=Neil Stevens <neil@qualityassistant.com>
+Extension=wav,au,aiff,snd
+MimeType=audio/x-wav,audio/basic,audio/x-aiff
+Preference=5
diff --git a/audiofile_artsplugin/audiofilePlayObjectI.cpp b/audiofile_artsplugin/audiofilePlayObjectI.cpp
new file mode 100644
index 00000000..377a9d25
--- /dev/null
+++ b/audiofile_artsplugin/audiofilePlayObjectI.cpp
@@ -0,0 +1,343 @@
+// audiofilePlayObject
+//
+// Copyright (C) 2001 Neil Stevens <neil@qualityassistant.com>
+// Copyright (C) 2002 Rik Hemsley (rikkus) <rik@kde.org>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+// AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// 
+// Except as contained in this notice, the name(s) of the author(s) shall not be
+// used in advertising or otherwise to promote the sale, use or other dealings
+// in this Software without prior written authorization from the author(s).
+
+#include "audiofilePlayObjectI.h"
+
+#include <resample.h>
+#include <soundserver.h>
+#include <convert.h>
+#include <debug.h>
+#include <math.h>
+#include <stdlib.h>
+
+namespace Arts
+{
+  class AudioFilePlayObjectRefiller : public Refiller
+  {
+    public:
+
+      AudioFilePlayObjectRefiller()
+        : fileHandle_(AF_NULL_FILEHANDLE),
+      frameSize_(0)
+      {
+      }
+
+      void setFileHandle(AFfilehandle fileHandle)
+      {
+        fileHandle_ = fileHandle;
+      }
+
+      void setFrameSize(unsigned int frameSize)
+      {
+        frameSize_ = frameSize;
+      }
+
+
+      unsigned long read(unsigned char * buffer, unsigned long len)
+      {
+        if (AF_NULL_FILEHANDLE == fileHandle_)
+          return 0;
+
+        int framesRead =
+          afReadFrames
+          (fileHandle_, AF_DEFAULT_TRACK, (void *)buffer, len / frameSize_);
+
+        if (-1 == framesRead)
+          return 0;
+
+        return framesRead * frameSize_;
+      }
+
+    private:
+
+      AFfilehandle fileHandle_;
+      unsigned int frameSize_;
+  };
+}
+
+static inline AFframecount timeToFrame(poTime time, float samplingRate)
+{
+  float seconds = time.seconds;
+  // ignoring ms
+  return (int)(floor(seconds * samplingRate));
+}
+
+static inline poTime frameToTime(AFframecount frame, float samplingRate)
+{
+  float seconds = (float)frame / samplingRate;
+  poTime time;
+  time.seconds = (long int)(floor(seconds));
+  time.ms = (long int)(floor(seconds * 1000.0) - (time.seconds * 1000.0));
+  return time;
+}
+
+audiofilePlayObjectI::audiofilePlayObjectI()
+  : audiofilePlayObject_skel()
+  , StdSynthModule()
+  , fh(AF_NULL_FILEHANDLE)
+  , channels(0)
+  , frameSize(0)
+  , sampleWidth(0)
+  , samplingRate(0)
+  , myState(posIdle)
+  , _speed(1.0)
+  , resampler(0)
+{
+  refiller  = new AudioFilePlayObjectRefiller;
+  resampler = new Arts::Resampler(refiller);
+}
+
+audiofilePlayObjectI::~audiofilePlayObjectI()
+{
+  delete refiller;
+  refiller = 0;
+
+  delete resampler;
+  resampler = 0;
+
+  if (sanityCheck())
+  {
+    afCloseFile(fh);
+    fh = AF_NULL_FILEHANDLE;
+  }
+}
+
+bool audiofilePlayObjectI::loadMedia(const string &filename)
+{
+  if (sanityCheck())
+  {
+    afCloseFile(fh);
+    fh = AF_NULL_FILEHANDLE;
+    refiller->setFileHandle(fh);
+  }
+
+  fh = afOpenFile(filename.c_str(), "r", 0);
+
+  if (!sanityCheck())
+  {
+    this->filename = "";
+    return false;
+  }
+
+  this->filename = filename;
+  afSetVirtualByteOrder(fh, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN);
+
+  int sampleFormat;
+
+  channels      = afGetChannels(fh, AF_DEFAULT_TRACK);
+
+  afGetSampleFormat(fh, AF_DEFAULT_TRACK, &sampleFormat, &sampleWidth);
+
+  samplingRate  = afGetRate(fh, AF_DEFAULT_TRACK);
+  frameSize     = sampleWidth / 8 * channels;
+
+  arts_debug("loading wav: %s", filename.c_str());
+  arts_debug("  frame size: %d", frameSize);
+
+  resampler->setChannels(channels);
+  resampler->setBits(sampleWidth);
+  resampler->setEndianness(Arts::Resampler::littleEndian);
+
+  refiller->setFileHandle(fh);
+  refiller->setFrameSize(frameSize);
+
+  arts_debug("  channels: %d", channels);
+  arts_debug("  bits: %d",sampleWidth);
+
+  myState = posIdle;
+  return true;
+}
+
+string audiofilePlayObjectI::description()
+{
+  return "audiofilePlayObject";
+}
+
+string audiofilePlayObjectI::mediaName()
+{
+  return filename;
+}
+
+poCapabilities audiofilePlayObjectI::capabilities()
+{
+  return static_cast<poCapabilities>(capSeek | capPause);
+}
+
+poState audiofilePlayObjectI::state()
+{
+  if(!sanityCheck())
+    return posIdle;
+  else  
+    return myState;
+}
+
+void audiofilePlayObjectI::play()
+{
+  myState = posPlaying;
+}
+
+void audiofilePlayObjectI::pause()
+{
+  myState = posPaused;
+}
+
+void audiofilePlayObjectI::halt()
+{
+  afSeekFrame(fh, AF_DEFAULT_TRACK, 0);
+  myState = posIdle;
+}
+
+poTime audiofilePlayObjectI::currentTime()
+{
+  if (!sanityCheck())
+    return poTime(0,0,0,"samples");
+
+  AFfileoffset offset = afTellFrame(fh, AF_DEFAULT_TRACK);
+
+  float timesec = offset / samplingRate;
+  float timems = (timesec - floor(timesec)) * 1000.0;
+
+  return poTime
+    (
+      int(timesec),
+      int(timems),
+      offset,
+      "samples"
+    );
+}
+
+poTime audiofilePlayObjectI::overallTime()
+{
+  if (!sanityCheck())
+    return poTime(0, 0, 0, "samples");
+
+  AFfileoffset offset = afGetTrackBytes(fh, AF_DEFAULT_TRACK) / frameSize;
+
+  float timesec = offset / (float)samplingRate;
+  float timems = (timesec - floor(timesec)) * 1000.0;
+
+  return poTime(int(timesec), int(timems), offset, "samples");
+}
+
+void audiofilePlayObjectI::seek(const poTime &time)
+{
+  if (!sanityCheck())
+  {
+    return;
+  }
+
+  float fnewsamples = -1;
+
+  if (time.seconds != -1 && time.ms != -1)
+  {
+    float flnewtime = (float)time.seconds+((float)time.ms/1000.0);
+    fnewsamples = flnewtime * samplingRate;
+  }
+  else if (time.custom >= 0 && time.customUnit == "samples")
+  {
+    fnewsamples = time.custom;
+  }
+
+  // Avoid going past end of file.
+
+  AFfileoffset eof = afGetTrackBytes(fh, AF_DEFAULT_TRACK) / frameSize;
+
+  if (fnewsamples > (float)eof)
+    fnewsamples = (float)eof;
+
+  // Avoid going past beginning of file.
+
+  if (fnewsamples < 0)
+    fnewsamples = 0.0;
+
+  afSeekFrame(fh, AF_DEFAULT_TRACK, (unsigned long)fnewsamples);
+}
+
+void audiofilePlayObjectI::calculateBlock(unsigned long count)
+{
+  if (myState == posPlaying)
+  {
+    double speed = samplingRate / samplingRateFloat;
+
+    resampler->setStep(speed * _speed);
+    resampler->run(left, right, count);
+
+    if (resampler->underrun())
+    {
+      myState = posIdle;
+    }
+  }
+  else
+  {
+    for (unsigned long i = 0; i < count; i++)
+    {
+      left[i] = right[i] = 0;
+    }
+  }
+
+}
+
+AutoSuspendState audiofilePlayObjectI::autoSuspend()
+{
+  return asNoSuspend;
+}
+
+float audiofilePlayObjectI::speed()
+{
+  return _speed;
+}
+
+void audiofilePlayObjectI::speed(float newSpeed)
+{
+  if(newSpeed != _speed)
+  {
+    _speed = newSpeed;
+    speed_changed(_speed);
+  }
+}
+
+void audiofilePlayObjectI::start()
+{
+}
+
+void audiofilePlayObjectI::stop()
+{
+}
+
+void audiofilePlayObjectI::streamInit()
+{
+}
+
+void audiofilePlayObjectI::streamStart()
+{
+}
+
+void audiofilePlayObjectI::streamEnd()
+{
+}
+
+REGISTER_IMPLEMENTATION(audiofilePlayObjectI);
+// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1
diff --git a/audiofile_artsplugin/audiofilePlayObjectI.h b/audiofile_artsplugin/audiofilePlayObjectI.h
new file mode 100644
index 00000000..3d0246a3
--- /dev/null
+++ b/audiofile_artsplugin/audiofilePlayObjectI.h
@@ -0,0 +1,95 @@
+// audiofilePlayObject
+//
+// Copyright (C) 2001 Neil Stevens <neil@qualityassistant.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+// AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// 
+// Except as contained in this notice, the name(s) of the author(s) shall not be
+// used in advertising or otherwise to promote the sale, use or other dealings
+// in this Software without prior written authorization from the author(s).
+
+#ifndef AUDIOFILEPLAYOBJECTI_H
+#define AUDIOFILEPLAYOBJECTI_H
+
+#include "audiofilearts.h"
+#include <stdsynthmodule.h>
+
+#include <string>
+
+namespace Arts
+{
+  class Resampler;
+  class AudioFilePlayObjectRefiller;
+}
+
+extern "C"
+{
+#include <audiofile.h>
+}
+
+using namespace Arts;
+using namespace std; // violation of Kyoto protocol against namespace pollution
+
+class audiofilePlayObjectI : public audiofilePlayObject_skel, public StdSynthModule
+{
+public:
+	audiofilePlayObjectI();
+	~audiofilePlayObjectI();
+
+	bool loadMedia(const string &);
+	string description();
+	string mediaName();
+	poCapabilities capabilities();
+	poState state();
+	void play();
+	void pause();
+	void halt();
+	poTime currentTime();
+	poTime overallTime();
+	void seek(const poTime &);
+	void calculateBlock(unsigned long samples);
+
+	// functions demanded by the linker
+	AutoSuspendState autoSuspend();
+	void start();
+	void stop();
+	void streamInit();
+	void streamStart();
+	void streamEnd();
+
+	// PitchablePlayObject:
+	float speed();
+	void speed(float newSpeed);
+
+private:
+	bool sanityCheck(void) { return fh != AF_NULL_FILEHANDLE; };
+
+	AFfilehandle fh;
+	
+	int channels, frameSize, sampleWidth;
+	float samplingRate;
+
+	poState myState;
+	std::string filename;
+
+	float _speed;
+	Arts::Resampler             * resampler;
+	AudioFilePlayObjectRefiller * refiller;
+};
+
+#endif
diff --git a/audiofile_artsplugin/audiofilearts.idl b/audiofile_artsplugin/audiofilearts.idl
new file mode 100644
index 00000000..6532c0e7
--- /dev/null
+++ b/audiofile_artsplugin/audiofilearts.idl
@@ -0,0 +1,12 @@
+#include <kmedia2.idl>
+#include <soundserver.idl>
+
+module Arts
+{
+
+interface audiofilePlayObject : PlayObject, SynthModule, PitchablePlayObject
+{
+	out audio stream left, right;
+};
+
+};
diff --git a/audiofile_artsplugin/configure.in.bot b/audiofile_artsplugin/configure.in.bot
new file mode 100644
index 00000000..1ac1ffa1
--- /dev/null
+++ b/audiofile_artsplugin/configure.in.bot
@@ -0,0 +1,9 @@
+if test "x$with_audiofile" = xcheck && test "x$arts_audiolib_found" = xno; then
+  echo ""
+  echo "You're missing libaudiofile. aRts won't be able to load or play"
+  echo "any samples without it, so please install it."
+  echo "Have a look at http://oss.sgi.com/projects/audiofile/ or find a"
+  echo "binary package for your platform."
+  echo ""
+  all_tests=bad
+fi
diff --git a/audiofile_artsplugin/configure.in.in b/audiofile_artsplugin/configure.in.in
new file mode 100644
index 00000000..367e64d3
--- /dev/null
+++ b/audiofile_artsplugin/configure.in.in
@@ -0,0 +1,52 @@
+if test "x$build_arts" = "xno"; then
+  DO_NOT_COMPILE="$DO_NOT_COMPILE audiofile_artsplugin"
+fi
+
+dnl libaudiofile is used for loading wave files
+AC_DEFUN([AC_CHECK_LIBAUDIOFILE],
+[
+  ac_ldflags_save="$LDFLAGS"
+  ac_CPPFLAGS_save="$CPPFLAGS"
+  LDFLAGS="$all_libraries $LDFLAGS"
+  CPPFLAGS="$CPPFLAGS $all_includes"
+  arts_audiolib_found=no
+  dnl WAV reading
+  AC_LANG_SAVE
+  AC_LANG_C
+  kde_has_audio_lib=no
+  AC_CHECK_HEADER(audiofile.h,
+  [ 
+     kde_has_audio_lib=yes
+    ])
+  if test "x$kde_has_audio_lib" = "xyes"; then
+      KDE_CHECK_LIB(audiofile,afOpenFile,[
+      dnl LDFLAGS in case it's in KDEDIR/lib
+      LIBAUDIOFILE="$LDFLAGS -laudiofile"
+      AC_DEFINE(HAVE_LIBAUDIOFILE, 1,
+        [Define if you have libaudiofile (required for playing wavs with aRts)])
+      arts_audiolib_found=yes
+      ])
+  fi
+  AC_SUBST(LIBAUDIOFILE)
+  AC_LANG_RESTORE
+  CPPFLAGS="$ac_CPPFLAGS_save"
+  LDFLAGS="$ac_ldflags_save"
+])
+
+AC_ARG_WITH(audiofile,
+  [AC_HELP_STRING(--with-audiofile,
+    [enable support for audiofile @<:@default=check@:>@])],
+  [], with_audiofile=check)
+
+arts_audiolib_found=no
+if test "x$with_audiofile" != xno; then
+  AC_CHECK_LIBAUDIOFILE
+
+  if test "x$with_audiofile" != xcheck && test "x$arts_audiolib_found" != xyes; then
+    AC_MSG_ERROR([--with-audiofile was given, but test for audiofile failed])
+  fi
+fi
+
+if test x$arts_audiolib_found = xno; then
+  DO_NOT_COMPILE="$DO_NOT_COMPILE audiofile_artsplugin"
+fi