diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2011-03-23 09:34:17 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2011-03-23 09:34:17 +0000 |
| commit | 089941209ae1ab0ff66dd3ebde007824027e611e (patch) | |
| tree | cf7b1b6c34858812c6bd7a0f1c25d6dfc9ee0f27 /src/net/java/sip | |
| parent | 9aae11943e37e69b92b1c46f6746a373c022ddbf (diff) | |
| download | jitsi-089941209ae1ab0ff66dd3ebde007824027e611e.zip jitsi-089941209ae1ab0ff66dd3ebde007824027e611e.tar.gz jitsi-089941209ae1ab0ff66dd3ebde007824027e611e.tar.bz2 | |
Disable LTI-CIVIL capture devices.
Diffstat (limited to 'src/net/java/sip')
| -rw-r--r-- | src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java | 2 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java index decfe5e..fdf43eb 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java @@ -203,7 +203,7 @@ public class GoogleContactsQuery @Override protected void run() { - GoogleContactsServiceImpl service = (GoogleContactsServiceImpl) + GoogleContactsServiceImpl service = GoogleContactsActivator.getGoogleContactsService(); gQuery = new GoogleQuery(query); diff --git a/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java b/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java index 53c15ed..f9fa18c 100644 --- a/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java +++ b/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java @@ -238,6 +238,8 @@ public class JmfDeviceDetector //FMJ boolean fmjVideoAvailable = isFMJVideoAvailable(); + /* disable LTI-CIVIL for now as we have native capture for all OS */ + /* try { if(fmjVideoAvailable) @@ -250,6 +252,7 @@ public class JmfDeviceDetector exc); fmjVideoAvailable = false; } + */ if (OSUtils.IS_MAC) // QuickTime { |