[jitsi~svn:10213] Sync with Jitsi r10212.

jitsi-android-sync at java.net jitsi-android-sync at java.net
Fri Dec 21 08:38:31 CET 2012


Project:    jitsi
Repository: svn
Revision:   10213
Author:     jitsi-android-sync
Date:       2012-12-21 07:38:26 UTC
Link:       

Log Message:
------------
Sync with Jitsi r10212. 
Adds capability for Windows to retrieve the model identifier for audio devices. But there is still some issues with using it. Thus, disables temporaly the use of model identifier.




Revisions:
----------
10213


Modified Paths:
---------------
jitsi-android/src/org/jitsi/impl/neomedia/device/AudioRecordSystem.java
jitsi-android/src/org/jitsi/impl/neomedia/device/OpenSLESSystem.java
jitsi-android/lib/installer-exclude/libjitsi.jar
jitsi-android


Diffs:
------
Index: jitsi-android/src/org/jitsi/impl/neomedia/device/AudioRecordSystem.java
===================================================================
--- jitsi-android/src/org/jitsi/impl/neomedia/device/AudioRecordSystem.java	(revision 10212)
+++ jitsi-android/src/org/jitsi/impl/neomedia/device/AudioRecordSystem.java	(revision 10213)
@@ -81,7 +81,7 @@
                     "android.media.AudioRecord",
                     new MediaLocator(LOCATOR_PROTOCOL + ":"),
                     formats.toArray(new Format[formats.size()]),
-                    null, null);
+                    null, null, null);
         List<ExtendedCaptureDeviceInfo> captureDevices
             = new ArrayList<ExtendedCaptureDeviceInfo>(1);
 
Index: jitsi-android/src/org/jitsi/impl/neomedia/device/OpenSLESSystem.java
===================================================================
--- jitsi-android/src/org/jitsi/impl/neomedia/device/OpenSLESSystem.java	(revision 10212)
+++ jitsi-android/src/org/jitsi/impl/neomedia/device/OpenSLESSystem.java	(revision 10213)
@@ -148,7 +148,7 @@
                         "OpenSL ES",
                         new MediaLocator(LOCATOR_PROTOCOL + ":"),
                         formats.toArray(new Format[formats.size()]),
-                        null, null);
+                        null, null, null);
             List<ExtendedCaptureDeviceInfo> captureDevices
                 = new ArrayList<ExtendedCaptureDeviceInfo>(1);
 
Index: jitsi-android/lib/installer-exclude/libjitsi.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: jitsi-android
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r10210-10212








More information about the commits mailing list