r3469 - in trunk/libminisip: . include include/libminisip/media/soundcard source/subsystem_media/soundcard
mikma at minisip.org
mikma at minisip.org
Sat Nov 17 11:11:27 CET 2007
Author: mikma
Date: 2007-11-17 11:11:27 +0100 (Sat, 17 Nov 2007)
New Revision: 3469
Added:
trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.h
Removed:
trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h
Modified:
trunk/libminisip/Makefile.am
trunk/libminisip/include/Makefile.am
trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx
Log:
Make OssSoundDevice.h a private header file.
Modified: trunk/libminisip/Makefile.am
===================================================================
--- trunk/libminisip/Makefile.am 2007-11-16 19:40:46 UTC (rev 3468)
+++ trunk/libminisip/Makefile.am 2007-11-17 10:11:27 UTC (rev 3469)
@@ -220,7 +220,7 @@
if !OS_WIN
if ENABLE_OSS
- libsoundcard_src += source/subsystem_media/soundcard/OssSoundDevice.cxx
+ libsoundcard_src += source/subsystem_media/soundcard/OssSoundDevice.cxx source/subsystem_media/soundcard/OssSoundDevice.h
endif ENABLE_OSS
endif !OS_WIN
Modified: trunk/libminisip/include/Makefile.am
===================================================================
--- trunk/libminisip/include/Makefile.am 2007-11-16 19:40:46 UTC (rev 3468)
+++ trunk/libminisip/include/Makefile.am 2007-11-17 10:11:27 UTC (rev 3469)
@@ -81,7 +81,6 @@
libminisip/media/soundcard/FileSoundDevice.h \
libminisip/media/soundcard/FileSoundDriver.h \
libminisip/media/soundcard/AudioMixerSpatial.h \
- libminisip/media/soundcard/OssSoundDevice.h \
libminisip/media/soundcard/SoundDevice.h \
libminisip/media/soundcard/SilenceSensor.h \
libminisip/media/soundcard/SoundIO.h \
Deleted: trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h 2007-11-16 19:40:46 UTC (rev 3468)
+++ trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h 2007-11-17 10:11:27 UTC (rev 3469)
@@ -1,75 +0,0 @@
-/*
- Copyright (C) 2004-2006 the Minisip Team
-
- 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) 2004
- *
- * Authors: Erik Eliasson <eliasson at it.kth.se>
- * Johan Bilien <jobi at via.ecp.fr>
- * Cesc Santasusana <c e s c DOT s a n t a [AT} g m a i l DOT c o m>
-*/
-
-#ifndef OSSSOUNDDEVICE_H
-#define OSSSOUNDDEVICE_H
-
-#include<libminisip/libminisip_config.h>
-
-#include<libminisip/media/soundcard/SoundDevice.h>
-
-#ifndef DISABLE_OSS
-
-#include<sys/soundcard.h>
-#include<sys/ioctl.h>
-
-#include<unistd.h>
-#include<stdio.h>
-#include <fcntl.h>
-#include<iostream>
-#include<errno.h>
-
-class LIBMINISIP_API OssSoundDevice: public SoundDevice{
- public:
- OssSoundDevice( std::string device );
-
- virtual int readFromDevice( byte_t * buffer, uint32_t nSamples );
- virtual int writeToDevice( byte_t * buffer, uint32_t nSamples );
-
- virtual int readError( int errcode, byte_t * buffer, uint32_t nSamples );
- virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
-
- virtual int openPlayback( int32_t samplingRate, int nChannels, int format );
- virtual int openRecord( int32_t samplingRate, int nChannels, int format );
-
- virtual int closePlayback();
- virtual int closeRecord();
-
- virtual void sync();
-
- virtual std::string getMemObjectType() const { return "OssSoundDevice";};
-
- private:
- int fdPlayback;
- int fdRecord;
-
- int fragment_setting;
-
-};
-
-
-#endif //DISABLE_OSS
-
-#endif
Modified: trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.cxx 2007-11-16 19:40:46 UTC (rev 3468)
+++ trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.cxx 2007-11-17 10:11:27 UTC (rev 3469)
@@ -25,7 +25,7 @@
#include<config.h>
-#include<libminisip/media/soundcard/OssSoundDevice.h>
+#include"OssSoundDevice.h"
#ifndef DISABLE_OSS
#include<config.h>
Copied: trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.h (from rev 3468, trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h)
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.h (rev 0)
+++ trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.h 2007-11-17 10:11:27 UTC (rev 3469)
@@ -0,0 +1,75 @@
+/*
+ Copyright (C) 2004-2006 the Minisip Team
+
+ 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) 2004
+ *
+ * Authors: Erik Eliasson <eliasson at it.kth.se>
+ * Johan Bilien <jobi at via.ecp.fr>
+ * Cesc Santasusana <c e s c DOT s a n t a [AT} g m a i l DOT c o m>
+*/
+
+#ifndef OSSSOUNDDEVICE_H
+#define OSSSOUNDDEVICE_H
+
+#include<libminisip/libminisip_config.h>
+
+#include<libminisip/media/soundcard/SoundDevice.h>
+
+#ifndef DISABLE_OSS
+
+#include<sys/soundcard.h>
+#include<sys/ioctl.h>
+
+#include<unistd.h>
+#include<stdio.h>
+#include <fcntl.h>
+#include<iostream>
+#include<errno.h>
+
+class LIBMINISIP_API OssSoundDevice: public SoundDevice{
+ public:
+ OssSoundDevice( std::string device );
+
+ virtual int readFromDevice( byte_t * buffer, uint32_t nSamples );
+ virtual int writeToDevice( byte_t * buffer, uint32_t nSamples );
+
+ virtual int readError( int errcode, byte_t * buffer, uint32_t nSamples );
+ virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
+
+ virtual int openPlayback( int32_t samplingRate, int nChannels, int format );
+ virtual int openRecord( int32_t samplingRate, int nChannels, int format );
+
+ virtual int closePlayback();
+ virtual int closeRecord();
+
+ virtual void sync();
+
+ virtual std::string getMemObjectType() const { return "OssSoundDevice";};
+
+ private:
+ int fdPlayback;
+ int fdRecord;
+
+ int fragment_setting;
+
+};
+
+
+#endif //DISABLE_OSS
+
+#endif
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx 2007-11-16 19:40:46 UTC (rev 3468)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx 2007-11-17 10:11:27 UTC (rev 3469)
@@ -30,7 +30,7 @@
#ifndef WIN32
#ifdef ENABLE_OSS
-# include<libminisip/media/soundcard/OssSoundDevice.h>
+# include"OssSoundDevice.h"
#endif
#endif
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx 2007-11-16 19:40:46 UTC (rev 3468)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx 2007-11-17 10:11:27 UTC (rev 3469)
@@ -67,23 +67,6 @@
#include<libminisip/media/soundcard/SoundDevice.h>
-#ifndef WIN32
-# ifdef ENABLE_OSS
-# include<libminisip/media/soundcard/OssSoundDevice.h>
-# endif
-# ifdef HAVE_LIBASOUND
-# include<libminisip/media/soundcard/SoundDevice.h>
-# endif
-#else
-# ifdef DSOUND
-# include<libminisip/media/soundcard/SoundDevice.h>
-# elif defined(WAVE_SOUND)
-# include<libminisip/media/soundcard/SoundDevice.h>
-# else
-# error "NO Windows AUDIO Defined!"
-# endif
-#endif
-
#define BS 160
using namespace std;
More information about the Minisip-devel
mailing list