summaryrefslogtreecommitdiff
path: root/sd/source/ui/remotecontrol/Server.cxx
AgeCommit message (Collapse)AuthorFilesLines
2013-02-19improve bluetooth discoverability toggling API.Michael Meeks1-8/+6
Change-Id: I289d43fcb173b64b01183a41f780bc74d2ba0abe (cherry picked from commit 21979643e47e503a20113b1e8e98814717c71ac5) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19Merge in Bluetooth code for the Impress Remote for OS XTor Lillqvist1-0/+1
Thirteen commits from master squashed into one commit. Original commit messages in order below, so note that claims are in many cases overridden by later commits. === This is the 1st commit message: Work in progress. It sets up the SDP service record and registers it, and that seems to work. Does not do anything with it yet. I wonder if the current approach to use the standard SerialPort service class will work for Macs, as they by default have one SerialPort service running, "Bluetooth-PDA-Sync", whatever that is. There is no code in the Android app to handle the case of there being several Serial Port services on the computer it wants to connect to, so what happens then when there are two will be interesting to see. (I can't find in the Android API any way to enumerate services that use the same service class. If there was, the app could choose the correct one based on its name.) So probably we should pretty soon switch to using a dedicated service class UUID instead of using the standard serial port one. As we already have the app out in the wild it will probably have to be modified to look for both Serial Port and our own service then? Sigh. === This is the 2nd commit message: Add this single-line file === This is the 3rd commit message: Fix build against Mac OS X SDK 10.4 === This is the 4th commit message: More work on the Impress Remote Control Bluetooth code for OS X Mostly the work of Thorsten, from December, adapted to compile against the current remote control code, and with one or two crucial things added. Plus lots of SAL_INFO calls added; once it works well many of them can be dropped. Does not work properly yet, do not cherry-pick just this to 4.0. === This is the 5th commit message: Nothing in the C standard about sockets === This is the 6th commit message: Fix compilation for Linux and hopefully Windows, too === This is the 7th commit message: Blind fix for WaE: class does not fully implement protocol The Xcode 3 compiler warns: class 'ChannelDelegate' does not fully implement the 'IOBluetoothRFCOMMChannelDelegate' protocol. === This is the 8th commit message: pragma GCC diagnostic is not available for 4.0.1 === This is the 9th commit message: std::vector::data() is C++11 === This is the 10th commit message: WaE: comparison is always true due to limited range of data type === This is the 11th commit message: Be specific in the logging as multiple threads involved Sure, each SAL_INFO output line includes the thread ID, but still, good to avoid confusion from where this line is coming. === This is the 12th commit message: Plug autorelease leak === This is the 13th commit message: Handle gracefully the remote end closing the RFCOMM channel Avoids a crash if one presses the "back" key on the Android remote control. (cherry picked from commit 100ac0876f1038aea7e7ef56f95d008ecc6aea3d) (cherry picked from commit c30e94a9cfc05ca8882fe78749b41207611910fb) (cherry picked from commit bc96a84370fb167ab2c63582c10535992f31768c) (cherry picked from commit f9685dc555cc79fe3a52caf9da39df37da750cd4) (cherry picked from commit dca5d2b1677ebffd1a4ff791c47b33a6252210b2) (cherry picked from commit bd6201ee4df1b7f54b1e768167a88ea5faa38fcc) (cherry picked from commit 05dbe2dda095aee2b595a29b95b5952acbe55e67) (cherry picked from commit c21916ad8a315a9dd7f23bf9aef0576975470a5a) (cherry picked from commit 730cff74c04dc6ec2cfc9cf9dcec172392f50616) (cherry picked from commit 21bec368ad670e368d4b5cadae1c07962710f115) (cherry picked from commit da3d37b968a79ff59fcc4103174b5b6bc3ec74c0) (cherry picked from commit b008101fd754b6b81c4f31e3079f01a21434601d) (cherry picked from commit 6ce04df28c8b5d6043340efe6fdc229b51dd8c36) Change-Id: Ic72b432b2174e2ad31225a1b5fa97c1a79330e48 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-08sdremote: Disable Impress Remote in the menu also when not allowed in Options.Jan Holesovsky1-4/+3
Conflicts: sd/source/ui/view/drviews7.cxx Change-Id: Ida8a3847a54c5415e1802a6688e110202bac35c1
2013-02-08sdremote: More logging.Jan Holesovsky1-0/+5
Change-Id: I5fe792ddfe1fac5166865c51014d87309d48bab2 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-11-27sdremote: make it possible to have only bluetooth enabledMiklos Vajna1-17/+24
Previously bluetooth didn't work without a running TCP server. Now the TCP server isn't listening (unless experimental features are enabled), and yet bluetooth can be used once the remote control setting is enabled. Change-Id: I44248642d7e12ded2d4c731d0105bcab88c7fd5a
2012-11-26Give sdremote a separate option, apart from Experimental featuresMiklos Vajna1-1/+1
Change-Id: I34f299acaa489d5c619c764c917b8a8d26b71557
2012-11-24cleanup - no need for salhelper::Thread mostlyThorsten Behrens1-1/+0
Change-Id: I27461e094141efd364a2c21da75151da490da2f3
2012-11-16renamed --enable-bluetooth to --enable-sdremote-bluetoothEnrico Weigelt, metux ITS1-3/+3
The current configure option --enable-bluetooth is a bit misleading, it doesn't really tell what it's actually for. Therefore renamed it, so it's more clear that it's an sdremote backend using bluetooth. Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa Reviewed-on: https://gerrit.libreoffice.org/1086 Reviewed-by: Rene Engelhard <rene.engelhard.re@googlemail.com> Tested-by: Rene Engelhard <rene.engelhard.re@googlemail.com>
2012-10-22WaE: unused parameterTor Lillqvist1-0/+2
Change-Id: I15bfeda7f9bf0fbeff9e4f3297f127941cadcf9b
2012-10-21fix sdremote related configure switchesRene Engelhard1-0/+8
sdremote itself apparently works also over IP (WLAN), so we don't need to disable it when we just don't want/have bluetooth. And also dbus is also needed in the bluez case Change-Id: I55ba07cd715d1e9bd641ef28e2391e4fe85b85e0
2012-10-13Prefer prefix ++/-- operators for non-primitive typesJulien Nabet1-4/+4
+ replace "<" by "!=" for end iterator comparison with current it Change-Id: I6e90caa8752c7057cca8c74fca12c0a050544dbb
2012-09-20Add SAL_WARN/INFO to network server + remove static reference on exit.Andrzej J.R. Hunt1-3/+14
Change-Id: I76e737f59aa36bf7982255fa9bb41ef9d6abfe8d
2012-09-19Fold ImpressSdRemote.xcs back into Impress.xcsStephan Bergmann1-5/+3
This effectively reverts 8c5cd962353dd9ce8234211a66547eb057202eb5 "config split for sdremote" (what was the rationale for that, anyway? having the two little additions in Impress.xcs always should not be a big deal), 63a73c119c188e6a4b22fb99fc2571f200073bde "Hopefully fix the remote config access to work with the new schema.", ee5403b98bf0e89693a14f7a1ae5658d9e5eb730 "officecfg: generate header for Impress-sdremote, handle "-" in xcs name", and 4cce7027a6e700a6a7392b806c3d059172268f6d "Rename Impress-sdremote.xcs to ImpressSdRemote.xcs + add to postprocess." Change-Id: Iba6162a3c1d9e688960c794265bd04128f58cc0c
2012-09-19Rename Impress-sdremote.xcs to ImpressSdRemote.xcs + add to postprocess.Andrzej J.R. Hunt1-3/+3
Change-Id: Iead72e5dca861a422507cf70d9b35366c701c84a
2012-09-18officecfg: generate header for Impress-sdremote, handle "-" in xcs nameMichael Stahl1-2/+4
Change-Id: I3f965a293cb6cbd5cafe42e1a05565282f2e10c7
2012-09-18Hopefully fix the remote config access to work with the new schema.Andrzej J.R. Hunt1-3/+3
Change-Id: I0f7e355c4a50ea51c386e9db02047e130b354a26
2012-09-18Switch bluetooth discoverability on when remote dialog shown (Linux).Andrzej J.R. Hunt1-4/+14
Change-Id: Ie0e4f7a353d77f5312deea06f0a316d8e1b1ed47
2012-09-18Provide client with state of server on startup.Andrzej J.R. Hunt1-2/+6
Change-Id: Ic516afd65025cf4a8c7d3539d9010ad30e05e429
2012-09-17Add pin_validating message to protocol to allow for feedback in app.Andrzej J.R. Hunt1-0/+2
Change-Id: Ia4cfd0b848408713cff4f476e6d6be069d1cb5a8
2012-09-16Prefer prefix ++/-- operators for non-primitive typeJulien Nabet1-4/+4
Change-Id: I0373b40ee404c74ca3c2bd479c5f7b18b7495548
2012-09-11On error, properly exit from Impress RemoteServer::getClientsThorsten Behrens1-2/+3
Looks like the actual return was missing in front of the empty vector. Change-Id: I0ccf0be53ef54138a3ebffab7b09b93b8c629aa0
2012-09-06Moved all internal details for ClientInfo out of the header.Andrzej J.R. Hunt1-15/+24
Change-Id: I64102536f12875b9834ce99763925f1544a87e8f
2012-09-04Restore correct saving of authorised servers.Andrzej J.R. Hunt1-4/+7
Change-Id: Ibb1eaab3ceb4aba8a73594c87d9fd487169e0143
2012-08-28Saving of authorised remotes.Andrzej J.R. Hunt1-2/+62
Change-Id: I4cf6542352ac4213e66e2bbd6cc54d4f9372de62
2012-08-22Bluetooth connection working (Linux).Andrzej J.R. Hunt1-2/+2
Change-Id: Iac77c3ce0ab0ea7bda3105c58859888e55e64d2d
2012-08-20Bluetooth discovery and attempts at communication.Andrzej J.R. Hunt1-0/+2
Change-Id: I88e261b7d0f830f67166d4eaf592298015b1c5ae
2012-08-13Final fixes for pairing.Andrzej J.R. Hunt1-0/+2
Change-Id: Ib66f227062f9c263dbc3dfefaf70525c73bdedc9
2012-08-10Pairing implemented server side.Andrzej J.R. Hunt1-7/+59
Change-Id: I542e563df68d38691f7c95cebf66aeb32071bd66
2012-08-10Refactored remote communication to allow for pairing.Andrzej J.R. Hunt1-103/+70
Change-Id: Ia31e33fca6dca47faa1fad1a5879c3902df05835
2012-08-10Basic Impress Remote + linking of dialog and server.Andrzej J.R. Hunt1-0/+14
Change-Id: Ifd69df9ccfb5b6a78044b002b6ec5bf1f12b6faa
2012-08-07Basic framework for Remote Dialog.Andrzej J.R. Hunt1-0/+6
Change-Id: Ie744c1a0db1661b9dd57976d6f27b12a6f0ba824
2012-08-07Disable Remote unless in experimental mode.Andrzej J.R. Hunt1-3/+8
Change-Id: I56263eeed7ce4376f6c4647efe699c2c6005f13d
2012-08-07Hopefully cleanly close Server Thread when necessary.Andrzej J.R. Hunt1-1/+4
Change-Id: If5a850b2f4c813c5a277ed0d4bc5179dd4095b10
2012-08-07Fixed segfault on client exit.Andrzej J.R. Hunt1-1/+2
Change-Id: I802551094e0cae2a4e1709723f0fc1661ba32af5
2012-08-06warning C4101: unreferenced local variableMichael Stahl1-1/+1
Change-Id: I0eac170f7fafebb438b1516fa271cc4971a9704d
2012-08-06Some minor fixes.Andrzej J.R. Hunt1-4/+1
Change-Id: Id405b97440efc7160e76d535bddfd5580923fe24
2012-08-06Basic structure for Disovery Service.Andrzej J.R. Hunt1-0/+2
Change-Id: Idaae84c46fa96b128ab32451853922c9eb11c6cc
2012-08-06Renamed Server to RemoteServer for obviousness.Andrzej J.R. Hunt1-15/+15
Change-Id: Ia935a97fe57eb1259c3426f0414bec7362f2e8cf
2012-08-06Added automatic hiding of clockbar as necessary.Andrzej J.R. Hunt1-4/+0
Change-Id: Id758f8e3f73e9d7d180e09b606ee44cbe5c48d6c
2012-08-06Implemented Thumbnail activity.Andrzej J. R. Hunt1-2/+1
Change-Id: I I6de8651f3ed36798ca1cc69765c448b821a819a2
2012-08-06Fixed a further bug in the Listener cycle. Refactored image storage.Andrzej J. R. Hunt1-9/+9
Change-Id: I2b3f9e2c46dafde4bd488bc95675c04e8806c9a4
2012-08-06Moved preview image preparation/transfer into separate class. Enabled.Andrzej J. R. Hunt1-3/+13
Change-Id: I09b0c2d1521939af058526d1727d0c4d34ad0452
2012-08-06Fixed Listener registration and destruction for all cases.Andrzej J. R. Hunt1-35/+27
Change-Id: I I I8be3c67889969d714514ca073c48ab26248a30e1
2012-08-06Fixed the Listener lifecycle, prevents crash on slideshow exit.Andrzej J. R. Hunt1-5/+7
Change-Id: I918754dc7b99cd48bbc012d62b2a8cd0eb0e438e
2012-08-06Finally fixed the Transmitter bug.Andrzej J. R. Hunt1-3/+4
Change-Id: Ia4c345b9ecb58a47219ceb0af14b66294ca3309e
2012-08-06Further minor improvements, attempt to fix the Transmitter bug.Andrzej J. R. Hunt1-5/+6
Change-Id: I558b7aca1c592efb5b83b56df42da4a97a655e88
2012-08-06Fixed segfault on use of transmitter, and transmitter lifecycle.Andrzej J. R. Hunt1-12/+17
Change-Id: I3983b28443584f33a879ba9fab52f11a0ab7fad5
2012-08-06Attempted fix for threading & memory bug with Transmitter.Andrzej J. R. Hunt1-10/+8
Change-Id: I I I6e66d197a18d9707b85804e98a9f690f7dda5087
2012-08-06Fixed constructor issue in Listener, fixed usage of Transmitter.Andrzej J. R. Hunt1-7/+14
Change-Id: I875cb1fba51faadafd8f7f0e34ef6b56a818bb7a
2012-08-06Added registration of the slideshow listener.Andrzej J. R. Hunt1-4/+29
Change-Id: I Icaf2fe03e5f5b8ee9de3138b8dd28d837c734e94