r3470 - in trunk/libminisip: . include include/libminisip/media/soundcard source/subsystem_media/soundcard
mikma at minisip.org
mikma at minisip.org
Sat Nov 17 11:27:07 CET 2007
Author: mikma
Date: 2007-11-17 11:27:07 +0100 (Sat, 17 Nov 2007)
New Revision: 3470
Added:
trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.h
Removed:
trunk/libminisip/include/libminisip/media/soundcard/FileSoundDriver.h
Modified:
trunk/libminisip/Makefile.am
trunk/libminisip/include/Makefile.am
trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx
Log:
Move FileSoundDriver.h to the source directory making it private.
Modified: trunk/libminisip/Makefile.am
===================================================================
--- trunk/libminisip/Makefile.am 2007-11-17 10:11:27 UTC (rev 3469)
+++ trunk/libminisip/Makefile.am 2007-11-17 10:27:07 UTC (rev 3470)
@@ -194,6 +194,7 @@
${AUDIOMIXER_SRC} \
source/subsystem_media/soundcard/FileSoundDevice.cxx \
source/subsystem_media/soundcard/FileSoundDriver.cxx \
+ source/subsystem_media/soundcard/FileSoundDriver.h \
source/subsystem_media/soundcard/FileSoundSource.cxx \
source/subsystem_media/soundcard/SoundDevice.cxx \
source/subsystem_media/soundcard/SoundDriver.cxx \
Modified: trunk/libminisip/include/Makefile.am
===================================================================
--- trunk/libminisip/include/Makefile.am 2007-11-17 10:11:27 UTC (rev 3469)
+++ trunk/libminisip/include/Makefile.am 2007-11-17 10:27:07 UTC (rev 3470)
@@ -79,7 +79,6 @@
libminisip/media/soundcard/SoundSource.h \
libminisip/media/soundcard/FileSoundSource.h \
libminisip/media/soundcard/FileSoundDevice.h \
- libminisip/media/soundcard/FileSoundDriver.h \
libminisip/media/soundcard/AudioMixerSpatial.h \
libminisip/media/soundcard/SoundDevice.h \
libminisip/media/soundcard/SilenceSensor.h \
Deleted: trunk/libminisip/include/libminisip/media/soundcard/FileSoundDriver.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/FileSoundDriver.h 2007-11-17 10:11:27 UTC (rev 3469)
+++ trunk/libminisip/include/libminisip/media/soundcard/FileSoundDriver.h 2007-11-17 10:27:07 UTC (rev 3470)
@@ -1,53 +0,0 @@
-/*
- Copyright (C) 2006 Mikael Magnusson
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/* Copyright (C) 2006
- *
- * Authors: Mikael Magnusson <mikma at users.sourceforge.net>
- */
-
-#ifndef FILESOUNDDRIVER_H
-#define FILESOUNDDRIVER_H
-
-#include<libminisip/libminisip_config.h>
-
-#include<string>
-#include<libmutil/MemObject.h>
-
-#include<libminisip/media/soundcard/SoundDriver.h>
-
-
-class FileSoundDriver: public SoundDriver{
- public:
- FileSoundDriver( MRef<Library*> lib );
- virtual ~FileSoundDriver();
- virtual MRef<SoundDevice*> createDevice( std::string deviceId );
- virtual std::string getDescription() const { return "FileSound sound driver"; };
-
- virtual std::vector<SoundDeviceName> getDeviceNames() const;
-
- virtual std::string getName() const {
- return "FileSound";
- }
-
- virtual std::string getMemObjectType() const { return getName(); }
-
- virtual uint32_t getVersion() const;
-};
-
-#endif // FILESOUNDDRIVER_H
Modified: trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.cxx 2007-11-17 10:11:27 UTC (rev 3469)
+++ trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.cxx 2007-11-17 10:27:07 UTC (rev 3470)
@@ -27,7 +27,7 @@
#include<libminisip/media/soundcard/SoundDriverRegistry.h>
#include<libmutil/MPlugin.h>
-#include<libminisip/media/soundcard/FileSoundDriver.h>
+#include"FileSoundDriver.h"
#include<libminisip/media/soundcard/FileSoundDevice.h>
using namespace std;
Copied: trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.h (from rev 3468, trunk/libminisip/include/libminisip/media/soundcard/FileSoundDriver.h)
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.h (rev 0)
+++ trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.h 2007-11-17 10:27:07 UTC (rev 3470)
@@ -0,0 +1,53 @@
+/*
+ Copyright (C) 2006 Mikael Magnusson
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+/* Copyright (C) 2006
+ *
+ * Authors: Mikael Magnusson <mikma at users.sourceforge.net>
+ */
+
+#ifndef FILESOUNDDRIVER_H
+#define FILESOUNDDRIVER_H
+
+#include<libminisip/libminisip_config.h>
+
+#include<string>
+#include<libmutil/MemObject.h>
+
+#include<libminisip/media/soundcard/SoundDriver.h>
+
+
+class FileSoundDriver: public SoundDriver{
+ public:
+ FileSoundDriver( MRef<Library*> lib );
+ virtual ~FileSoundDriver();
+ virtual MRef<SoundDevice*> createDevice( std::string deviceId );
+ virtual std::string getDescription() const { return "FileSound sound driver"; };
+
+ virtual std::vector<SoundDeviceName> getDeviceNames() const;
+
+ virtual std::string getName() const {
+ return "FileSound";
+ }
+
+ virtual std::string getMemObjectType() const { return getName(); }
+
+ virtual uint32_t getVersion() const;
+};
+
+#endif // FILESOUNDDRIVER_H
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx 2007-11-17 10:11:27 UTC (rev 3469)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx 2007-11-17 10:27:07 UTC (rev 3470)
@@ -26,7 +26,7 @@
#include<libminisip/media/soundcard/SoundDriverRegistry.h>
#include<libmutil/dbg.h>
-#include<libminisip/media/soundcard/FileSoundDriver.h>
+#include"FileSoundDriver.h"
#ifdef _MSC_VER
#include"DirectSoundDriver.h"
@@ -34,10 +34,6 @@
#include<algorithm>
-// #ifdef PORTAUDIO_SUPPORT
-// #include<libminisip/media/soundcard/PortAudioDriver.h>
-// #endif
-
using namespace std;
#ifdef DEBUG_OUTPUT
More information about the Minisip-devel
mailing list