[Openh323-cvs] pwlib/src/ptlib/common osutils.cxx,1.230,1.231 pglobalstatic.cxx,1.3,1.4 vfakeio.cxx,1.31,1.32

[Craig S. <cso...@us...>]

Update of /cvsroot/openh323/pwlib/src/ptlib/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29134/src/ptlib/common

Modified Files:
	osutils.cxx pglobalstatic.cxx vfakeio.cxx 
Log Message:
More patches for MacOSX, thanks to Hannes Friederich


Index: osutils.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/common/osutils.cxx,v
retrieving revision 1.230
retrieving revision 1.231
diff -C2 -d -r1.230 -r1.231
*** osutils.cxx	26 Jan 2005 05:37:59 -0000	1.230
--- osutils.cxx	31 Jan 2005 08:05:40 -0000	1.231
***************
*** 28,31 ****
--- 28,34 ----
   *
   * $Log$
+  * Revision 1.231  2005/01/31 08:05:40  csoutheren
+  * More patches for MacOSX, thanks to Hannes Friederich
+  *
   * Revision 1.230  2005/01/26 05:37:59  csoutheren
   * Added ability to remove config file support
***************
*** 776,779 ****
--- 779,790 ----
  #include <ctype.h>
  
+ #ifdef __MACOSX__
+ namespace PWLibStupidOSXHacks {
+ 	extern int loadShmVideoStuff;
+ 	extern int loadCoreAudioStuff;
+ 	extern int loadFakeVideoStuff;
+ };
+ #endif
+ 
  class PSimpleThread : public PThread
  {
***************
*** 1918,1921 ****
--- 1929,1947 ----
  
    Construct();
+   
+ #ifdef __MACOSX__
+   
+ #ifdef HAS_VIDEO
+   PWLibStupidOSXHacks::loadFakeVideoStuff = 1;
+ #ifdef USE_SHM_VIDEO_DEVICES
+   PWLibStupidOSXHacks::loadShmVideoStuff = 1;
+ #endif // USE_SHM_VIDEO_DEVICES
+ #endif // HAS_VIDEO
+   
+ #ifdef HAS_AUDIO
+   PWLibStupidOSXHacks::loadCoreAudioStuff = 1;
+ #endif // HAS_AUDIO
+   
+ #endif // __MACOSX__
  
    // create one instance of each class registered in the 

Index: pglobalstatic.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/common/pglobalstatic.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pglobalstatic.cxx	11 Jan 2005 06:57:15 -0000	1.3
--- pglobalstatic.cxx	31 Jan 2005 08:05:41 -0000	1.4
***************
*** 25,28 ****
--- 25,31 ----
   *
   * $Log$
+  * Revision 1.4  2005/01/31 08:05:41  csoutheren
+  * More patches for MacOSX, thanks to Hannes Friederich
+  *
   * Revision 1.3  2005/01/11 06:57:15  csoutheren
   * Fixed namespace collisions with plugin starup factories
***************
*** 98,102 ****
  #endif
  
! 
  namespace PWLibStupidWindowsHacks 
  {
--- 101,106 ----
  #endif
  
! // Should be enclosed with an #ifdef __WIN32__ or similiar
! // otherwise, linking will fail on MacOSX with ./configure --disable-audio
  namespace PWLibStupidWindowsHacks 
  {

Index: vfakeio.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/common/vfakeio.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** vfakeio.cxx	4 Jan 2005 07:44:03 -0000	1.31
--- vfakeio.cxx	31 Jan 2005 08:05:41 -0000	1.32
***************
*** 25,28 ****
--- 25,31 ----
   *
   * $Log$
+  * Revision 1.32  2005/01/31 08:05:41  csoutheren
+  * More patches for MacOSX, thanks to Hannes Friederich
+  *
   * Revision 1.31  2005/01/04 07:44:03  csoutheren
   * More changes to implement the new configuration methodology, and also to
***************
*** 135,138 ****
--- 138,147 ----
  #include <ptlib/videoio.h>
  
+ #ifdef __MACOSX__
+ namespace PWLibStupidOSXHacks {
+ 	int loadFakeVideoStuff;
+ };
+ #endif
+ 
  #define NUM_PATTERNS 6
  #define MAX_L_HEIGHT 11