Commit Graph

5103 Commits

Author SHA1 Message Date
Armin Novak
051892a8b1 Fixed typo.
Fixed XML menu configuration.
2013-10-04 11:43:42 +02:00
Armin Novak
a9c351a0ae Moved async settings to debug menu.
Fixed classpath settings for aFreeRDP project.
2013-10-04 11:30:51 +02:00
Armin Novak
d7ee71cc8b Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async
Conflicts:
	client/Android/FreeRDPCore/.classpath
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java
2013-10-04 10:04:03 +02:00
Armin Novak
b5e7a91690 Merge remote-tracking branch 'upstream/master' into android_async 2013-10-04 09:48:01 +02:00
Bernhard Miklautz
5c61ac97cb Merge pull request #1524 from akallabeth/android_debug_settings
Add debug settings menu for android

Menu needs to be activated with cmake with -DWITH_ANDROID_DEBUG_MENU=ON
2013-10-03 05:36:42 -07:00
Bernhard Miklautz
7ad0a33fb0 Merge pull request #1531 from bmiklautz/issue/1526
android: fixed classpaths
2013-10-03 04:38:48 -07:00
Bernhard Miklautz
ce6150cc12 Merge pull request #1530 from akallabeth/android_microphone_enable_by_default
Removed forced disable of microphone redirection for android builds.
2013-10-03 04:32:28 -07:00
Bernhard Miklautz
a88ed35a0a android: fixed classpaths
fixes #1526
2013-10-03 13:28:31 +02:00
Armin Novak
5abe42226d Removed forced disable of microphone redirection for android builds. 2013-10-03 13:21:42 +02:00
Armin Novak
f4b68b2d02 Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_debug_settings
Conflicts:
	cmake/ConfigOptionsAndroid.cmake
2013-10-02 17:43:14 +02:00
Armin Novak
38323a4568 Implemented debug menu hidden in relase builds. 2013-10-02 14:29:08 +02:00
Martin Fleisz
3db1b51ba1 Merge pull request #1521 from bmiklautz/issue/1519
Android build default ndk level
2013-10-02 01:39:14 -07:00
Armin Novak
16936dc061 Added CMake generated BuildConfiguration java class. 2013-10-02 10:24:44 +02:00
Bernhard Miklautz
199909e8f1 andriod: removed unecessary config option 2013-10-02 10:24:07 +02:00
Bernhard Miklautz
257a1cb8cc FindOpenSLES: removed debug message 2013-10-02 10:23:06 +02:00
Bernhard Miklautz
4c3ceb6093 android build: set default ndk api level to 9
API level 9 is required in order build the android client with audio
support.
2013-10-01 23:30:58 +02:00
Bernhard Miklautz
6d060d2fcc android build: don't set WITH_OPENSLES in options
WITH_OPENSLES is automatically set by find_feature
2013-10-01 23:22:45 +02:00
Bernhard Miklautz
a5dca8b446 opensles detection: fail required but not found 2013-10-01 23:21:35 +02:00
Armin Novak
836ccc28b2 Added missing assert. 2013-10-01 16:23:17 +02:00
Armin Novak
83a64e99ea Merge branch 'android_async' of github.com:akallabeth/FreeRDP into android_async
Conflicts:
	client/Android/FreeRDPCore/.classpath
	client/Android/FreeRDPCore/jni/android_freerdp.c
2013-10-01 16:22:27 +02:00
Armin Novak
3910d512fa Implemented async_input handling. 2013-10-01 16:17:52 +02:00
Armin Novak
b2236b7a4d Implemented async_channels, async_transport and async_update. 2013-10-01 16:17:26 +02:00
Armin Novak
111d0c670c Added new advanced configuration options for async. 2013-10-01 16:16:37 +02:00
Bernhard Miklautz
d7a9add3b4 Merge pull request #1514 from akallabeth/android_sound
Android sound support
2013-10-01 02:20:44 -07:00
Armin Novak
27566ce566 Fixed invalid return. 2013-10-01 11:19:16 +02:00
Armin Novak
627e6ce4d5 Renamed configuration options, translations still missing... 2013-10-01 11:05:34 +02:00
Armin Novak
fe336da721 Implemented async_input handling. 2013-10-01 10:33:28 +02:00
Bernhard Miklautz
2cb6f5407a Merge pull request #1491 from akallabeth/android_profiler
Android profiler
2013-10-01 00:53:35 -07:00
Armin Novak
2fec8ad4c8 Implemented async_channels, async_transport and async_update. 2013-09-30 17:52:13 +02:00
Armin Novak
1e041d1952 Added new advanced configuration options for async. 2013-09-30 16:33:45 +02:00
Armin Novak
8ccf7f8ca2 Fixed queue initialization and overflow checks. 2013-09-30 10:11:54 +02:00
Armin Novak
6d14739ada Working microphone input without sound gaps. 2013-09-30 10:08:22 +02:00
Armin Novak
95468dcf17 Modified rdpsnd opensles backend, now just filling queue and not waiting
for completion of playback, results in better sound quality.
2013-09-27 15:55:14 +02:00
Armin Novak
c96cef5dd8 Ok, now actually creating 3 buffers initially. 2013-09-27 15:13:12 +02:00
Armin Novak
b07caafdbf Added triple buffer to avoid gaps between frames. 2013-09-27 15:07:32 +02:00
Armin Novak
84610f02e7 Sound redirection in android client now allows selecting server side sound. 2013-09-27 13:45:41 +02:00
Armin Novak
e7f941c419 Deactivated formats not working. 2013-09-27 12:06:30 +02:00
Armin Novak
2269cbe155 Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_sound 2013-09-27 11:46:48 +02:00
Armin Novak
8139c4894b Cleaned up rdpsnd for android, prepared volume control. 2013-09-27 11:45:53 +02:00
Armin Novak
0558063a43 Increased mimimum android version to API level 9. Required for OpenSLES. 2013-09-27 11:44:24 +02:00
Armin Novak
d81421a76a Fixed android shutdown crash.
Added new permissions required for microphone redirection.
Fixed JNI call for microphone redirection.
2013-09-27 11:41:25 +02:00
Armin Novak
c2d3f60ad0 Initial working microphone redirection for android.
Added debug messages to alsa and pulse microphone backends.
2013-09-27 11:39:04 +02:00
Armin Novak
bd7845e656 Basic opensles microphone redirection support, data conversion still buggy.
Fixed pulse audio default device name, now working without arguments again.
2013-09-26 16:05:16 +02:00
Marc-André Moreau
0d7df9ab72 Merge pull request #1509 from akallabeth/smartcard_fixes
Smartcard fixes
2013-09-25 08:37:26 -07:00
Marc-André Moreau
3d6139f22c Merge pull request #1498 from akallabeth/snd_leak_fix
Fixed memory leak introduced with alsa playback fix and compiler warnings in files.
2013-09-25 08:29:01 -07:00
Marc-André Moreau
74c5fa8015 Merge pull request #1501 from bmiklautz/stable-sync
Merged changes from stable-1.1
2013-09-25 08:27:36 -07:00
Marc-André Moreau
aa4133b345 Merge pull request #1508 from bmiklautz/issue/1500
core/glyph: copy data when adding glyph to cache
2013-09-25 08:26:20 -07:00
Bernhard Miklautz
c99d9ee72b core/glyph: copy data when adding glyph to cache
fixes #1500
2013-09-24 23:25:18 +02:00
Armin Novak
632800679b Merge branch 'smartcard_fixes' of github.com:akallabeth/FreeRDP into smartcard_fixes
Conflicts:
	channels/smartcard/client/smartcard_operations.c
2013-09-24 09:48:21 +02:00
Armin Novak
4d8c47ce92 Replaced linkedLen, which is a padded version of the buffer length
from being used for reading from a packet. Now just used for sanity checks.
2013-09-24 09:23:43 +02:00