Commits

sunhaitao committed c7ab526

Cleared up code. Dropped supports to old Firefox versions.

  • Participants
  • Parent commits c53e23a

Comments (0)

Files changed (36)

File Components/BackEnds/AudioInput/OpenAlAudioInputBackEnd.cpp

 #include "nsStringAPI.h"
 #include "nsEmbedString.h"
 
-#include "JsUtils.h"
-
 NS_IMPL_ISUPPORTS1(OpenAlAudioInputDevice, dtIAudioInputDevice)
 
 OpenAlAudioInputDevice::OpenAlAudioInputDevice():

File Components/BackEnds/AudioInput/OpenAlAudioInputBackEnd.h

 
 #include "AudioInputBackEnd.h"
 
+#ifdef USE_OPENAL_SOFT
+#include "AL/al.h"
+#include "AL/alc.h"
+#else
 #include "al.h"
 #include "alc.h"
+#endif
 
 //28bfa43d-95dc-43da-90af-bb607770f62b
 #define OPEN_AL_AUDIO_INPUT_DEVICE_CID \

File Components/BackEnds/AudioInput/SConscript

 env = env.Clone()
 
 env.Prepend(
-	CPPPATH = ['../Commons', OPENAL_SDK_INC],
+#	CPPPATH = ['../Commons', OPENAL_SDK_INC],
+	CPPPATH = [OPENAL_SDK_INC],
 	LIBPATH = [OPENAL_SDK_LIB],
 	LIBS = {
 		"Windows":['openal32'],
 )
 
 xpcom_component = env.SharedLibrary(
-	'AudioInput-%d' % target_gecko_version, 
-	['../Commons/JsUtils.cpp'] + Glob('*.cpp'),
+	'AudioInput-%s' % target_gecko_version, 
+#	['../Commons/JsUtils.cpp'] + Glob('*.cpp'),
+	Glob('*.cpp'),
 )
 Command(
 	'../../dist/$SOURCE',

File Components/BackEnds/SConstruct

 Export('environ')
 
 if targetPlatform == "Windows":
-  cppflags = "/FI mozilla-config.h /Zc:wchar_t"
+  cppflags = "/FI mozilla-config.h"
   cppdefines = {'XP_WIN': 1}
   if ARGUMENTS.get('DEBUG', 0) == 0:
     cppflags += ' /MT'
       MSVC_VERSION = ARGUMENTS.get('MSVC_VERSION', '8.0Exp')
   )
 elif targetPlatform == 'Linux':
-  cppflags = '-include mozilla-config.h -fshort-wchar -std=c++0x'
+  cppflags = '-include mozilla-config.h -std=c++0x'
   if ARGUMENTS.get("DEBUG", 0):
       cppflags += ' -ggdb'
   else:
       cppflags += ' -O3'
   base_env = Environment(
       CPPFLAGS = cppflags,
-      CPPDEFINES = {'XP_LINUX': 1},
+      CPPDEFINES = {'XP_LINUX':1, 'USE_OPENAL_SOFT':1},
       LIBS = "xpcomglue_s"
   )
 
   Export('target_gecko_version')
 
   env = base_env.Clone()
-  if target_gecko_version >= 7:
-    env.Append(CPPDEFINES={'HAVE_JS_GETARRAYBUFFERDATA': 1})
+  env.Append(CPPDEFINES={'HAVE_JS_GETARRAYBUFFERDATA': 1})
 
-  XR_SDK_INC = environ.get("XR_SDK_%d_INC" % target_gecko_version, None)
-  XR_SDK_LIB = environ.get("XR_SDK_%d_LIB" % target_gecko_version, None)
+  XR_SDK_INC = environ.get("XR_SDK_%s_INC" % target_gecko_version, None)
+  XR_SDK_LIB = environ.get("XR_SDK_%s_LIB" % target_gecko_version, None)
 
   env.Prepend(CPPPATH = [XR_SDK_INC])
   env.Prepend(LIBPATH = [XR_SDK_LIB])
 
   Export('env')
 
-  commons = SConscript('Commons/SConscript', variant_dir="build-%d/Commons" % target_gecko_version, duplicate=0)
+  #commons = SConscript('Commons/SConscript', variant_dir="build-%s/Commons" % target_gecko_version, duplicate=0)
 
-  audioInput = SConscript('AudioInput/SConscript', variant_dir='build-%d/AudioInput' % target_gecko_version, duplicate=0)
-  Depends(audioInput, commons)
+  audioInput = SConscript('AudioInput/SConscript', variant_dir='build-%s/AudioInput' % target_gecko_version, duplicate=0)
+  #Depends(audioInput, commons)
 
-  videoInput = SConscript('VideoInput/SConscript', variant_dir='build-%d/VideoInput' % target_gecko_version, duplicate=0)
-  Depends(videoInput, commons)
+  videoInput = SConscript('VideoInput/SConscript', variant_dir='build-%s/VideoInput' % target_gecko_version, duplicate=0)
+  #Depends(videoInput, commons)
 
-build_conductory(7)
-build_conductory(8)
-build_conductory(9)
-build_conductory(10)
+build_conductory("R")
+build_conductory("B")
+build_conductory("A")
+build_conductory("N")
 

File Components/BackEnds/VideoInput/DShowVideoInputBackEnd.cpp

 #include "jscntxt.h"
 
 #include "DShowUtils.h"
-#include "JsUtils.h"
 
 #define ENSURE_SUCCESS(result) if (FAILED(result)) { return NS_ERROR_UNEXPECTED; }
 

File Components/BackEnds/VideoInput/SConscript

 env = env.Clone()
 
 env.Prepend(
-	CPPPATH = ['../Commons'],
-	LIBPATH = ['../Commons'],
-	LIBS = ['JsUtils'] + {
+#	CPPPATH = ['../Commons'],
+#	LIBPATH = ['../Commons'],
+#	LIBS = ['JsUtils'] + {
+	LIBS = {
 		"Windows":"strmiids ole32 oleaut32",
 		"Linux":"v4l2"
 	}[targetPlatform].split()
 }[targetPlatform]
 
 xpcom_component = env.SharedLibrary(
-	'VideoInput-%d' % target_gecko_version, 
+	'VideoInput-%s' % target_gecko_version, 
 	src_list
 )
 

File Components/BackEnds/VideoInput/V4L2VideoInputBackEnd.cpp

 #include "jstypedarray.h"
 #include "jscntxt.h"
 
-#include "JsUtils.h"
-
 const unsigned int bufferCount = 4;
 
 #define CLEAR(x) memset (&(x), 0, sizeof(x))

File Extension/components/AudioInput-10.dll

Binary file removed.

File Extension/components/AudioInput-7.dll

Binary file removed.

File Extension/components/AudioInput-8.dll

Binary file removed.

File Extension/components/AudioInput-9.dll

Binary file removed.

File Extension/components/AudioInput-A.dll

Binary file added.

File Extension/components/AudioInput-B.dll

Binary file added.

File Extension/components/AudioInput-N.dll

Binary file added.

File Extension/components/AudioInput-R.dll

Binary file added.

File Extension/components/VideoInput-10.dll

Binary file removed.

File Extension/components/VideoInput-7.dll

Binary file removed.

File Extension/components/VideoInput-8.dll

Binary file removed.

File Extension/components/VideoInput-9.dll

Binary file removed.

File Extension/components/VideoInput-A.dll

Binary file added.

File Extension/components/VideoInput-B.dll

Binary file added.

File Extension/components/VideoInput-N.dll

Binary file added.

File Extension/components/VideoInput-R.dll

Binary file added.

File Extension/components/dshow-video-input.manifest

 interfaces       VideoInputBackEnd.xpt
 binary-component VideoInput.dll abi=WINNT_x86-msvc
-binary-component VideoInput-7.dll abi=WINNT_x86-msvc
-binary-component VideoInput-8.dll abi=WINNT_x86-msvc
-binary-component VideoInput-9.dll abi=WINNT_x86-msvc
-binary-component VideoInput-10.dll abi=WINNT_x86-msvc
+binary-component VideoInput-R.dll abi=WINNT_x86-msvc
+binary-component VideoInput-B.dll abi=WINNT_x86-msvc
+binary-component VideoInput-A.dll abi=WINNT_x86-msvc
+binary-component VideoInput-N.dll abi=WINNT_x86-msvc
 

File Extension/components/libAudioInput-A.so

Binary file added.

File Extension/components/libAudioInput-B.so

Binary file added.

File Extension/components/libAudioInput-N.so

Binary file added.

File Extension/components/libAudioInput-R.so

Binary file added.

File Extension/components/libVideoInput-A.so

Binary file added.

File Extension/components/libVideoInput-B.so

Binary file added.

File Extension/components/libVideoInput-N.so

Binary file added.

File Extension/components/libVideoInput-R.so

Binary file added.

File Extension/components/openal-audio-input.manifest

 binary-component AudioInput.dll abi=WINNT_x86-msvc
 binary-component libAudioInput.so abi=Linux_x86-gcc3
 
-binary-component AudioInput-7.dll abi=WINNT_x86-msvc
-binary-component libAudioInput-7.so abi=Linux_x86-gcc3
+binary-component AudioInput-R.dll abi=WINNT_x86-msvc
+binary-component libAudioInput-R.so abi=Linux_x86-gcc3
 
-binary-component AudioInput-8.dll abi=WINNT_x86-msvc
-binary-component libAudioInput-8.so abi=Linux_x86-gcc3
+binary-component AudioInput-B.dll abi=WINNT_x86-msvc
+binary-component libAudioInput-B.so abi=Linux_x86-gcc3
 
-binary-component AudioInput-9.dll abi=WINNT_x86-msvc
-binary-component libAudioInput-9.so abi=Linux_x86-gcc3
+binary-component AudioInput-A.dll abi=WINNT_x86-msvc
+binary-component libAudioInput-A.so abi=Linux_x86-gcc3
 
-binary-component AudioInput-10.dll abi=WINNT_x86-msvc
-binary-component libAudioInput-10.so abi=Linux_x86-gcc3
+binary-component AudioInput-N.dll abi=WINNT_x86-msvc
+binary-component libAudioInput-N.so abi=Linux_x86-gcc3
 

File Extension/components/v4l2-video-input.manifest

 interfaces       VideoInputBackEnd.xpt
 binary-component libVideoInput.so abi=Linux_x86-gcc3
-binary-component libVideoInput-7.so abi=Linux_x86-gcc3
-binary-component libVideoInput-8.so abi=Linux_x86-gcc3
-binary-component libVideoInput-9.so abi=Linux_x86-gcc3
-binary-component libVideoInput-10.so abi=Linux_x86-gcc3
+binary-component libVideoInput-R.so abi=Linux_x86-gcc3
+binary-component libVideoInput-B.so abi=Linux_x86-gcc3
+binary-component libVideoInput-A.so abi=Linux_x86-gcc3
+binary-component libVideoInput-N.so abi=Linux_x86-gcc3
 

File INSTALL.Linux

  * scons
  * openal-soft-devel / libopenal-dev
  * libv4l-devel / libv4l-dev
- * XULRunner SDK 5.0
- * XULRunner SDK 6.0
- * XULRunner SDK 7.0
- * XULRunner SDK 8.0
+ * XULRunner SDK Release
+ * XULRunner SDK Beta
+ * XULRunner SDK Aurora
+ * XULRunner SDK Nightly
 
 2. Set following environment variables:
- XR_SDK_5_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 5.
- XR_SDK_5_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 5.
- XR_SDK_6_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 6.
- XR_SDK_6_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 6.
- XR_SDK_7_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 7.
- XR_SDK_7_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 7.
- XR_SDK_8_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 8.
- XR_SDK_8_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 8.
+ XR_SDK_R_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Release.
+ XR_SDK_R_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Release.
+ XR_SDK_B_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Beta.
+ XR_SDK_B_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Beta.
+ XR_SDK_A_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Aurora.
+ XR_SDK_A_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Aurora.
+ XR_SDK_N_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Nightly.
+ XR_SDK_N_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Nightly.
 
 3. Open a terminal. Change working directory to 'Components/BackEnds'.
 

File INSTALL.Win32

  * Visual C++ 2005 or later
  * Windows SDK 7.1
  * OpenAL SDK 1.1
- * XULRunner SDK 5.0
- * XULRunner SDK 6.0
- * XULRunner SDK 7.0
- * XULRunner SDK 8.0
+ * XULRunner SDK Release
+ * XULRunner SDK Beta
+ * XULRunner SDK Aurora
+ * XULRunner SDK Nightly
 
 2. Set following environment variables:
- XR_SDK_5_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 5.
- XR_SDK_5_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 5.
- XR_SDK_6_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 6.
- XR_SDK_6_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 6.
- XR_SDK_7_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 7.
- XR_SDK_7_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 7.
- XR_SDK_8_INC
-   to the absolute path of the 'include' folder of XULRunner SDK 8.
- XR_SDK_8_LIB
-   to the absolute path of the 'lib' folder of XULRunner SDK 8.
+ XR_SDK_R_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Release.
+ XR_SDK_R_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Release.
+ XR_SDK_B_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Beta.
+ XR_SDK_B_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Beta.
+ XR_SDK_A_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Aurora.
+ XR_SDK_A_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Aurora.
+ XR_SDK_N_INC
+   to the absolute path of the 'include' folder of XULRunner SDK Nightly.
+ XR_SDK_N_LIB
+   to the absolute path of the 'lib' folder of XULRunner SDK Nightly.
+ OPENAL_SDK_INC
+   to the absolute path of the 'include' folder of OpenAL 1.1 SDK.
+ OPENAL_SDK_LIB
+   to the absolute path of the 'libs\Win32' folder of OpenAL 1.1 SDK.
  WIN_SDK_INC
    to the absolute path of the 'include' folder of the Windows SDK.
  WIN_SDK_LIB