r3471 - in trunk/libminisip: include include/libminisip/media/soundcard source/subsystem_media/soundcard
mikma at minisip.org
mikma at minisip.org
Sat Nov 17 11:33:43 CET 2007
Author: mikma
Date: 2007-11-17 11:33:43 +0100 (Sat, 17 Nov 2007)
New Revision: 3471
Added:
trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.h
Removed:
trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h
Modified:
trunk/libminisip/include/Makefile.am
trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx
trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.cpp
Log:
Move WaveSoundDevice.h to the source directory. Not added to makefile since
WaveSoundDevice.cpp isn't used.
Modified: trunk/libminisip/include/Makefile.am
===================================================================
--- trunk/libminisip/include/Makefile.am 2007-11-17 10:27:07 UTC (rev 3470)
+++ trunk/libminisip/include/Makefile.am 2007-11-17 10:33:43 UTC (rev 3471)
@@ -73,7 +73,6 @@
libminisip/signaling/sip/SipDialogPresenceServer.h \
libminisip/media/soundcard/Resampler.h \
libminisip/media/soundcard/SoundRecorderCallback.h \
- libminisip/media/soundcard/WaveSoundDevice.h \
libminisip/media/soundcard/SoundIOPLCInterface.h \
libminisip/media/soundcard/AudioMixer.h \
libminisip/media/soundcard/SoundSource.h \
Deleted: trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h 2007-11-17 10:27:07 UTC (rev 3470)
+++ trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h 2007-11-17 10:33:43 UTC (rev 3471)
@@ -1,76 +0,0 @@
-#ifndef WAVE_SOUND_DEVICE_MSIP_H
-#define WAVE_SOUND_DEVICE_MSIP_H
-
-#include<libminisip/libminisip_config.h>
-
-#include <windows.h>
-#include <commctrl.h>
-#include <iostream>
-#include <mmsystem.h>
-#include<libminisip/media/soundcard/SoundDevice.h>
-#include<libminisip/media/soundcard/SoundDevice.h>
-
-class LIBMINISIP_API WaveSoundDevice:public SoundDevice{
-
- public:
- virtual ~WaveSoundDevice( );
- WaveSoundDevice( 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 int readError( int errcode, byte_t * buffer, uint32_t nSamples );
- virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
-
- void playBack();
-
- virtual void sync();
-
- virtual std::string getMemObjectType() const { return "OssSoundDevice";};
-
-// HWND getWindow(){return hWnd;};
-
- //already provided by the parrent class > soundDevice
- int getSampleSize(){return 2;}
- int getNChannelsPlay(){ return 1; };
- int getNChannelsRecord(){ return 1; };
-
-
- private:
-
-
- /* WAVEFORMATEX structure for reading in the WAVE fmt chunk */
- //bool openedPlayBack;
- //bool openedRecord;
-//window
-// HWND hWnd;
-};
-
-
-void playback();
-void freeBlocks(WAVEHDR* blockArray);
-void CALLBACK waveOutProc(HWAVEOUT hWaveOut,
- UINT uMsg,
- DWORD dwInstance,
- DWORD dwParam1,
- DWORD dwParam2 );
-
-
-/*
-long QueueWaveData(WAVEHDR * waveHeader);
-int stopRecord();
-int setOutputFormat();
-int prepareOutputBuffers();
-DWORD WINAPI waveInProc(LPVOID arg);
-void CALLBACK WaveOutProc(HWAVEOUT waveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2);
-*/
-#endif
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx 2007-11-17 10:27:07 UTC (rev 3470)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx 2007-11-17 10:33:43 UTC (rev 3471)
@@ -35,7 +35,7 @@
#endif
#ifdef WAVE_SOUND
-# include<libminisip/media/soundcard/WaveSoundDevice.h>
+# include"WaveSoundDevice.h"
#endif
#include<stdio.h>
Modified: trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.cpp
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.cpp 2007-11-17 10:27:07 UTC (rev 3470)
+++ trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.cpp 2007-11-17 10:33:43 UTC (rev 3471)
@@ -24,7 +24,7 @@
*/
#include<config.h>
-#include<libminisip/media/soundcard/WaveSoundDevice.h>
+#include"WaveSoundDevice.h"
#include <libmutil/thread.h>
@@ -324,4 +324,4 @@
void WaveSoundDevice::sync(){
}
-
\ No newline at end of file
+
Copied: trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.h (from rev 3468, trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h)
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.h (rev 0)
+++ trunk/libminisip/source/subsystem_media/soundcard/WaveSoundDevice.h 2007-11-17 10:33:43 UTC (rev 3471)
@@ -0,0 +1,76 @@
+#ifndef WAVE_SOUND_DEVICE_MSIP_H
+#define WAVE_SOUND_DEVICE_MSIP_H
+
+#include<libminisip/libminisip_config.h>
+
+#include <windows.h>
+#include <commctrl.h>
+#include <iostream>
+#include <mmsystem.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
+
+class LIBMINISIP_API WaveSoundDevice:public SoundDevice{
+
+ public:
+ virtual ~WaveSoundDevice( );
+ WaveSoundDevice( 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 int readError( int errcode, byte_t * buffer, uint32_t nSamples );
+ virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
+
+ void playBack();
+
+ virtual void sync();
+
+ virtual std::string getMemObjectType() const { return "OssSoundDevice";};
+
+// HWND getWindow(){return hWnd;};
+
+ //already provided by the parrent class > soundDevice
+ int getSampleSize(){return 2;}
+ int getNChannelsPlay(){ return 1; };
+ int getNChannelsRecord(){ return 1; };
+
+
+ private:
+
+
+ /* WAVEFORMATEX structure for reading in the WAVE fmt chunk */
+ //bool openedPlayBack;
+ //bool openedRecord;
+//window
+// HWND hWnd;
+};
+
+
+void playback();
+void freeBlocks(WAVEHDR* blockArray);
+void CALLBACK waveOutProc(HWAVEOUT hWaveOut,
+ UINT uMsg,
+ DWORD dwInstance,
+ DWORD dwParam1,
+ DWORD dwParam2 );
+
+
+/*
+long QueueWaveData(WAVEHDR * waveHeader);
+int stopRecord();
+int setOutputFormat();
+int prepareOutputBuffers();
+DWORD WINAPI waveInProc(LPVOID arg);
+void CALLBACK WaveOutProc(HWAVEOUT waveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2);
+*/
+#endif
More information about the Minisip-devel
mailing list