[Libreoffice-commits] .: 38 commits - accessibility/Makefile animations/Makefile apple_remote/AppleRemote.m apple_remote/GlobalKeyboardDevice.m apple_remote/HIDRemoteControlDevice.m apple_remote/inc apple_remote/KeyspanFrontRowControl.m apple_remote/Library_AppleRemote.mk apple_remote/Makefile apple_remote/makefile.mk apple_remote/Module_apple_remote.mk apple_remote/MultiClickRemoteBehavior.m apple_remote/Package_inc.mk apple_remote/prj apple_remote/RemoteControlContainer.m apple_remote/RemoteControl.m apple_remote/RemoteMainController.m apple_remote/source avmedia/Makefile basctl/Makefile basebmp/Makefile basegfx/Makefile basic/Makefile bean/Makefile binaryurp/Makefile bootstrap canvas/Library_directx5canvas.mk canvas/Makefile canvas/Module_canvas.mk canvas/source chart2/Makefile comphelper/Makefile config_host.mk.in configmgr/Makefile configure.in connectivity/source cppcanvas/Makefile cppuhelper/Makefile cppu/Makefile cross_toolset/Makefile cui/Makefile dbaccess/Makefile desktop/Makefi le download drawinglayer/Makefile dtrans/Makefile editeng/Makefile eventattacher/Makefile extensions/Makefile fileaccess/Makefile filter/Makefile forms/Makefile formula/Makefile fpicker/Makefile framework/Makefile .gitignore hwpfilter/Makefile i18npool/Makefile i18nutil/Makefile idl/Makefile libcmis/Makefile lingucomponent/Makefile linguistic/Makefile lotuswordpro/Makefile Makefile MathMLDTD/Makefile Mesa/Makefile mysqlc/source nlpsolver/Makefile np_sdk/Makefile o3tl/Makefile offapi/Makefile officecfg/Makefile oovbaapi/Makefile oox/Makefile package/Makefile packimages/pack padmin/Makefile postprocess/packcomponents psprint_config/Makefile qadevOOo/Makefile regexp/Makefile reportbuilder/util reportdesign/Makefile RepositoryExternal.mk rsc/Makefile salhelper/Makefile sal/Makefile sane/Makefile sax/Makefile scaddins/Makefile sccomp/Makefile sc/Makefile scp2/macros scp2/source scripting/Makefile sdext/source sd/Makefile set_soenv.in sfx2/Makefile slideshow/Makefile smoketest/dat a solenv/bin solenv/gbuild solenv/inc sot/Makefile starmath/Makefile svl/Makefile svtools/Makefile svx/Makefile swext/Makefile sw/Makefile tail_build/Makefile test/Makefile toolkit/Makefile tools/Makefile twain/Makefile ucbhelper/Makefile ucb/Makefile udkapi/Makefile unixODBC/Makefile UnoControls/Makefile unotools/Makefile unoxml/Makefile ure/Makefile uui/Makefile vbahelper/Makefile vcl/Makefile wizards/Makefile writerfilter/Makefile writerperfect/Makefile xmerge/Makefile xml2cmp/Makefile xmloff/Makefile xmlreader/Makefile xmlscript/Makefile xmlsecurity/Makefile

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Sun Feb 5 17:38:53 PST 2012


 .gitignore                                           |    5 
 Makefile                                             |  436 +++
 MathMLDTD/Makefile                                   |   37 
 Mesa/Makefile                                        |   37 
 RepositoryExternal.mk                                |    7 
 UnoControls/Makefile                                 |   37 
 accessibility/Makefile                               |   37 
 animations/Makefile                                  |   37 
 apple_remote/AppleRemote.m                           |  128 -
 apple_remote/GlobalKeyboardDevice.m                  |  249 --
 apple_remote/HIDRemoteControlDevice.m                |  528 ----
 apple_remote/KeyspanFrontRowControl.m                |   97 
 apple_remote/Library_AppleRemote.mk                  |   58 
 apple_remote/Makefile                                |    7 
 apple_remote/Module_apple_remote.mk                  |   39 
 apple_remote/MultiClickRemoteBehavior.m              |  213 -
 apple_remote/Package_inc.mk                          |   33 
 apple_remote/RemoteControl.m                         |  146 -
 apple_remote/RemoteControlContainer.m                |  140 -
 apple_remote/RemoteMainController.m                  |  168 -
 apple_remote/inc/AppleRemote.h                       |   50 
 apple_remote/inc/GlobalKeyboardDevice.h              |   53 
 apple_remote/inc/HIDRemoteControlDevice.h            |   66 
 apple_remote/inc/KeyspanFrontRowControl.h            |   52 
 apple_remote/inc/MultiClickRemoteBehavior.h          |   92 
 apple_remote/inc/RemoteControl.h                     |  120 
 apple_remote/inc/RemoteControlContainer.h            |   40 
 apple_remote/inc/RemoteMainController.h              |   59 
 apple_remote/inc/apple_remote/RemoteControl.h        |  120 
 apple_remote/inc/apple_remote/RemoteMainController.h |   59 
 apple_remote/makefile.mk                             |   82 
 apple_remote/prj/build.lst                           |    3 
 apple_remote/prj/d.lst                               |    4 
 apple_remote/prj/makefile.mk                         |    1 
 apple_remote/source/AppleRemote.h                    |   50 
 apple_remote/source/AppleRemote.m                    |  128 +
 apple_remote/source/GlobalKeyboardDevice.h           |   53 
 apple_remote/source/GlobalKeyboardDevice.m           |  253 ++
 apple_remote/source/HIDRemoteControlDevice.h         |   66 
 apple_remote/source/HIDRemoteControlDevice.m         |  535 ++++
 apple_remote/source/KeyspanFrontRowControl.h         |   52 
 apple_remote/source/KeyspanFrontRowControl.m         |   97 
 apple_remote/source/MultiClickRemoteBehavior.h       |   92 
 apple_remote/source/MultiClickRemoteBehavior.m       |  213 +
 apple_remote/source/RemoteControl.m                  |  151 +
 apple_remote/source/RemoteControlContainer.h         |   40 
 apple_remote/source/RemoteControlContainer.m         |  144 +
 apple_remote/source/RemoteMainController.m           |  169 +
 avmedia/Makefile                                     |   37 
 basctl/Makefile                                      |   37 
 basebmp/Makefile                                     |   37 
 basegfx/Makefile                                     |   37 
 basic/Makefile                                       |   37 
 bean/Makefile                                        |   37 
 binaryurp/Makefile                                   |   37 
 bootstrap                                            |   15 
 canvas/Library_directx5canvas.mk                     |  103 
 canvas/Makefile                                      |   37 
 canvas/Module_canvas.mk                              |    6 
 canvas/source/directx/directx5canvas.component       |   34 
 canvas/source/directx/dx_5rm.cxx                     | 2283 -------------------
 chart2/Makefile                                      |   37 
 comphelper/Makefile                                  |   37 
 config_host.mk.in                                    |  927 ++++---
 configmgr/Makefile                                   |   37 
 configure.in                                         |  968 +++++---
 connectivity/source/drivers/hsqldb/makefile.mk       |    4 
 cppcanvas/Makefile                                   |   37 
 cppu/Makefile                                        |   40 
 cppuhelper/Makefile                                  |   40 
 cross_toolset/Makefile                               |   14 
 cui/Makefile                                         |   37 
 dbaccess/Makefile                                    |   37 
 desktop/Makefile                                     |   37 
 download                                             |    2 
 drawinglayer/Makefile                                |   37 
 dtrans/Makefile                                      |   37 
 editeng/Makefile                                     |   37 
 eventattacher/Makefile                               |   37 
 extensions/Makefile                                  |   37 
 fileaccess/Makefile                                  |   37 
 filter/Makefile                                      |   37 
 forms/Makefile                                       |   37 
 formula/Makefile                                     |   37 
 fpicker/Makefile                                     |   37 
 framework/Makefile                                   |   37 
 hwpfilter/Makefile                                   |   37 
 i18npool/Makefile                                    |   37 
 i18nutil/Makefile                                    |   37 
 idl/Makefile                                         |   37 
 libcmis/Makefile                                     |   37 
 lingucomponent/Makefile                              |   37 
 linguistic/Makefile                                  |   37 
 lotuswordpro/Makefile                                |   37 
 mysqlc/source/makefile.mk                            |    2 
 nlpsolver/Makefile                                   |   37 
 np_sdk/Makefile                                      |   37 
 o3tl/Makefile                                        |   37 
 offapi/Makefile                                      |   37 
 officecfg/Makefile                                   |   37 
 oovbaapi/Makefile                                    |   37 
 oox/Makefile                                         |   37 
 package/Makefile                                     |   37 
 packimages/pack/makefile.mk                          |   10 
 padmin/Makefile                                      |   37 
 postprocess/packcomponents/makefile.mk               |    4 
 psprint_config/Makefile                              |   37 
 qadevOOo/Makefile                                    |   37 
 regexp/Makefile                                      |   37 
 reportbuilder/util/makefile.mk                       |    2 
 reportdesign/Makefile                                |   37 
 rsc/Makefile                                         |   37 
 sal/Makefile                                         |   37 
 salhelper/Makefile                                   |   40 
 sane/Makefile                                        |   37 
 sax/Makefile                                         |   37 
 sc/Makefile                                          |   37 
 scaddins/Makefile                                    |   37 
 sccomp/Makefile                                      |   37 
 scp2/macros/makefile.mk                              |    2 
 scp2/source/canvas/directxcanvas.scp                 |    3 
 scp2/source/canvas/makefile.mk                       |    3 
 scp2/source/ooo/makefile.mk                          |    4 
 scripting/Makefile                                   |   37 
 sd/Makefile                                          |   37 
 sdext/source/minimizer/makefile.mk                   |    4 
 sdext/source/pdfimport/makefile.mk                   |    2 
 sdext/source/presenter/makefile.mk                   |    2 
 set_soenv.in                                         | 1538 ------------
 sfx2/Makefile                                        |   37 
 slideshow/Makefile                                   |   37 
 smoketest/data/Global.xml                            |    4 
 smoketest/data/Test_10er.xml                         |    2 
 solenv/bin/build.pl                                  |   26 
 solenv/bin/callcatcher.Makefile                      |   31 
 solenv/bin/create-ids                                |    2 
 solenv/bin/create-tags                               |    2 
 solenv/gbuild/extensions/post_AuxTargets.mk          |  130 -
 solenv/gbuild/extensions/post_BuildplTargets.mk      |   73 
 solenv/gbuild/extensions/post_SpeedUpTargets.mk      |    6 
 solenv/gbuild/gbuild.mk                              |   12 
 solenv/gbuild/partial_build.mk                       |   14 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk              |    6 
 solenv/gbuild/source_and_rerun.mk                    |    5 
 solenv/gbuild/templates/Makefile                     |   37 
 solenv/inc/_tg_rslb.mk                               |   80 
 solenv/inc/installationtest.mk                       |    2 
 solenv/inc/settings.mk                               |    5 
 solenv/inc/tg_rslb.mk                                |    8 
 sot/Makefile                                         |   37 
 starmath/Makefile                                    |   37 
 svl/Makefile                                         |   37 
 svtools/Makefile                                     |   37 
 svx/Makefile                                         |   37 
 sw/Makefile                                          |   37 
 swext/Makefile                                       |   37 
 tail_build/Makefile                                  |    5 
 test/Makefile                                        |   37 
 toolkit/Makefile                                     |   37 
 tools/Makefile                                       |   37 
 twain/Makefile                                       |   37 
 ucb/Makefile                                         |   37 
 ucbhelper/Makefile                                   |   37 
 udkapi/Makefile                                      |   37 
 unixODBC/Makefile                                    |   37 
 unotools/Makefile                                    |   37 
 unoxml/Makefile                                      |   37 
 ure/Makefile                                         |   37 
 uui/Makefile                                         |   37 
 vbahelper/Makefile                                   |   37 
 vcl/Makefile                                         |   37 
 wizards/Makefile                                     |   37 
 writerfilter/Makefile                                |   37 
 writerperfect/Makefile                               |   37 
 xmerge/Makefile                                      |   37 
 xml2cmp/Makefile                                     |   37 
 xmloff/Makefile                                      |   37 
 xmlreader/Makefile                                   |   37 
 xmlscript/Makefile                                   |   37 
 xmlsecurity/Makefile                                 |   37 
 180 files changed, 4362 insertions(+), 10679 deletions(-)

New commits:
commit 7c64dd40b77eaebd9a025b746dd0487a5c7eb613
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Feb 3 21:01:18 2012 -0600

    fix bootstraping issue on x-compile

diff --git a/Makefile b/Makefile
index 9f9e93a..3cab806 100644
--- a/Makefile
+++ b/Makefile
@@ -352,11 +352,8 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto
 #
 # Bootstap
 #
-$(WORKDIR)/bootstrap: autogen
-	@cd $(SRCDIR) && ./bootstrap
-	@mkdir -p $(dir $@) && touch $@
 
-bootstrap: $(WORKDIR)/bootstrap autogen
+bootstrap: $(WORKDIR)/bootstrap
 
 #
 # Fetch
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 2149f4d..332e0d4 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,6 +27,10 @@
 
 .PHONY: cross-build-toolset dev-install build findunusedcode
 
+$(WORKDIR)/bootstrap:
+	@cd $(SRCDIR) && ./bootstrap
+	@mkdir -p $(dir $@) && touch $@
+
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
 
 .DEFAULT_GOAL=all
commit 3276baaf5e0a1f488ae7c51b9eaac739bc7f86e1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Feb 3 13:46:18 2012 -0600

    fix the autogen.sh final message, to give proper build instructions

diff --git a/configure.in b/configure.in
index 59b9216..8341d6c 100644
--- a/configure.in
+++ b/configure.in
@@ -10939,9 +10939,8 @@ $GNUMAKE check
 ATTENTION: Env.Host.sh and Env.Build.sh are no more.
 The environment is now in config_host.mk and config_build.mk (for cross-compile)
 You do not need to source them, even for partial build.
-In order to have 'build' and 'deliver' alias, source build_env instead.
-(you need to do that only once in a session. this is not impacted by
- autogen, clean etc...)
+run: make help
+for details
 
 _EOF
 
commit fbbcc07ff457b497a1e6c8d8327a5ce40bf31fb5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Jan 28 18:10:31 2012 -0600

    gbuildify apple_remote

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 91ff7a3..b607ac8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1023,6 +1023,13 @@ $(call gb_LinkTarget_add_libs,$(1), \
 
 endef
 
+define gb_LinkTarget__use_iokit
+$(call gb_LinkTarget_add_libs,$(1), \
+	-framework IOKit \
+)
+
+endef
+
 define gb_LinkTarget__use_qtkit
 $(call gb_LinkTarget_add_libs,$(1), \
 	-framework QTKit \
diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
deleted file mode 100644
index 95d8835..0000000
--- a/apple_remote/AppleRemote.m
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************
- * RemoteControlWrapper.m
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "AppleRemote.h"
-
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <IOKit/IOKitLib.h>
-#import <IOKit/IOCFPlugIn.h>
-#import <IOKit/hid/IOHIDKeys.h>
-
-const char* AppleRemoteDeviceName = "AppleIRController";
-
-// the WWDC 07 Leopard Build is missing the constant
-#ifndef NSAppKitVersionNumber10_4
-	#define NSAppKitVersionNumber10_4 824
-#endif
-#ifndef NSAppKitVersionNumber10_5
-	#define NSAppKitVersionNumber10_5 949
-#endif
-
- at implementation AppleRemote
-
-+ (const char*) remoteControlDeviceName {
-	return AppleRemoteDeviceName;
-}
-
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
-    
-    // TODO : avoid such magics 
-	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
-	    #ifdef DEBUG
-	    NSLog( @"setting 10.4 cookies" );
-	    #endif
-		// 10.4.x Tiger
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"14_12_11_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"14_13_11_6_"];		
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"14_7_6_14_7_6_"];			
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"14_8_6_14_8_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"14_9_6_14_9_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"14_10_6_14_10_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"18_14_6_18_14_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	} else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) {
-	    #ifdef DEBUG
-	    NSLog( @"setting 10.5 cookies" );
-	    #endif
-		// 10.5.x Leopard
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"31_30_28_19_18_"];	
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"31_20_19_18_31_20_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"31_21_19_18_31_21_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"31_22_19_18_31_22_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"31_23_19_18_31_23_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"31_19_18_4_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"31_19_18_3_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"31_19_18_31_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"35_31_19_18_35_31_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	}
-	else
-	{
-	    #ifdef DEBUG
-	    NSLog( @"setting 10.6 cookies" );
-	    #endif
-	    // 10.6.x Snow Leopard
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"33_32_30_21_20_2_"];	
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"33_22_21_20_2_33_22_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"33_23_21_20_2_33_23_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"33_24_21_20_2_33_24_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"33_25_21_20_2_33_25_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"33_21_20_14_12_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"33_21_20_13_12_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"33_21_20_2_33_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"37_33_21_20_2_37_33_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonPlay]       forKey:@"33_21_20_8_2_33_21_20_8_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonMiddlePlay] forKey:@"33_21_20_3_2_33_21_20_3_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
-	}
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
-	if (pressedDown == NO && event == kRemoteButtonMenu_Hold) {
-		// There is no seperate event for pressed down on menu hold. We are simulating that event here
-		[super sendRemoteButtonEvent:event pressedDown:YES];
-	}	
-	
-	[super sendRemoteButtonEvent:event pressedDown:pressedDown];
-	
-	if (pressedDown && (event == kRemoteButtonRight || event == kRemoteButtonLeft || event == kRemoteButtonPlay || event == kRemoteButtonMenu || event == kRemoteButtonPlay_Hold)) {
-		// There is no seperate event when the button is being released. We are simulating that event here
-		[super sendRemoteButtonEvent:event pressedDown:NO];
-	}
-}
-
- at end
diff --git a/apple_remote/GlobalKeyboardDevice.m b/apple_remote/GlobalKeyboardDevice.m
deleted file mode 100644
index 14bf558..0000000
--- a/apple_remote/GlobalKeyboardDevice.m
+++ /dev/null
@@ -1,249 +0,0 @@
-/*****************************************************************************
- * GlobalKeyboardDevice.m
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-
-#import "GlobalKeyboardDevice.h"
-
-#define F1 122
-#define F2 120
-#define F3 99
-#define F4 118
-#define F5 96
-#define F6 97
-#define F7 98
-
-/*
- the following default keys are read and shall be used to change the keyboard mapping
- 
- mac.remotecontrols.GlobalKeyboardDevice.plus_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.plus_keycode
- mac.remotecontrols.GlobalKeyboardDevice.minus_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.minus_keycode
- mac.remotecontrols.GlobalKeyboardDevice.play_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.play_keycode
- mac.remotecontrols.GlobalKeyboardDevice.left_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.left_keycode
- mac.remotecontrols.GlobalKeyboardDevice.right_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.right_keycode
- mac.remotecontrols.GlobalKeyboardDevice.menu_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.menu_keycode
- mac.remotecontrols.GlobalKeyboardDevice.playhold_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.playhold_keycode
- */
-
-static OSStatus hotKeyEventHandler(EventHandlerCallRef, EventRef, void*);
-
- at implementation GlobalKeyboardDevice
-
-- (id) initWithDelegate: (id) _remoteControlDelegate {	
-	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
-		hotKeyRemoteEventMapping = [[NSMutableDictionary alloc] init];
-		
-		unsigned int modifiers = cmdKey + shiftKey /*+ optionKey*/ + controlKey;
-				
-		[self mapRemoteButton:kRemoteButtonPlus			defaultKeycode:F1 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonMinus		defaultKeycode:F2 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonPlay			defaultKeycode:F3 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonLeft			defaultKeycode:F4 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonRight		defaultKeycode:F5 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonMenu			defaultKeycode:F6 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonPlay_Hold	defaultKeycode:F7 defaultModifiers:modifiers];		
-	}
-	return self;
-}
-
-- (void) dealloc {
-	[hotKeyRemoteEventMapping release];
-	[super dealloc];
-}
-
-- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers {
-	NSString* defaultsKey = NULL;	
-	
-	switch(remoteButtonIdentifier) {
-		case kRemoteButtonPlus:
-			defaultsKey = @"plus";
-			break;
-		case kRemoteButtonMinus:
-			defaultsKey = @"minus";
-			break;			
-		case kRemoteButtonMenu:
-			defaultsKey = @"menu";
-			break;			
-		case kRemoteButtonPlay:
-			defaultsKey = @"play";
-			break;
-		case kRemoteButtonRight:
-			defaultsKey = @"right";
-			break;			
-		case kRemoteButtonLeft:			
-			defaultsKey = @"left";
-			break;
-		case kRemoteButtonPlay_Hold:
-			defaultsKey = @"playhold";
-			break;			
-		default: 
-#ifdef DEBUG
-			NSLog(@"Unknown global keyboard defaults key for remote button identifier %d", remoteButtonIdentifier);
-#endif
-            break;
-	}
-	
-	NSNumber* modifiersCfg = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_modifiers", defaultsKey]];
-	NSNumber* keycodeCfg   = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_keycode", defaultsKey]];
-	
-	unsigned int modifiers = defaultModifiers;
-	if (modifiersCfg) modifiers = [modifiersCfg unsignedIntValue];
-	
-	unsigned int keycode = defaultKeycode;
-	if (keycodeCfg) keycode = [keycodeCfg unsignedIntValue];
-				  
-    [self registerHotKeyCode: keycode  modifiers: modifiers remoteEventIdentifier: remoteButtonIdentifier];
-}	
-
-- (void) setListeningToRemote: (BOOL) value {
-	if (value == [self isListeningToRemote]) return;
-	if (value) {
-		[self startListening: self];
-	} else {
-		[self stopListening: self];
-	}
-}
-- (BOOL) isListeningToRemote {	
-	return (eventHandlerRef!=NULL);
-}
-
-- (void) startListening: (id) sender {
-	
-	if (eventHandlerRef) return;
-		
-	EventTypeSpec eventSpec[2] = {
-		{ kEventClassKeyboard, kEventHotKeyPressed },
-		{ kEventClassKeyboard, kEventHotKeyReleased }
-	};    
-	
-	InstallEventHandler( GetEventDispatcherTarget(),
-						 (EventHandlerProcPtr)hotKeyEventHandler, 
-						 2, eventSpec, self, &eventHandlerRef);	
-}
-- (void) stopListening: (id) sender {
-	RemoveEventHandler(eventHandlerRef);
-	eventHandlerRef = NULL;
-}
-
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
-	NSEnumerator* values = [hotKeyRemoteEventMapping objectEnumerator];
-	NSNumber* remoteIdentifier;
-	while( (remoteIdentifier = [values nextObject]) ) {
-		if ([remoteIdentifier unsignedIntValue] == identifier) return YES;
-	}
-	return NO;
-}
-
-+ (const char*) remoteControlDeviceName {
-	return "Keyboard";
-}
-
-- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier {	
-	OSStatus err;
-	EventHotKeyID hotKeyID;
-	EventHotKeyRef carbonHotKey;
-
-	hotKeyID.signature = 'PTHk';
-	hotKeyID.id = (long)keycode;
-	
-	err = RegisterEventHotKey(keycode, modifiers, hotKeyID, GetEventDispatcherTarget(), 0, &carbonHotKey );
-	
-	if( err )
-		return NO;
-	
-	[hotKeyRemoteEventMapping setObject: [NSNumber numberWithInt:identifier] forKey: [NSNumber numberWithUnsignedInt: hotKeyID.id]];
-	
-	return YES;
-}
-/*
-- (void)unregisterHotKey: (PTHotKey*)hotKey
-{
-	OSStatus err;
-	EventHotKeyRef carbonHotKey;
-	NSValue* key;
-	
-	if( [[self allHotKeys] containsObject: hotKey] == NO )
-		return;
-	
-	carbonHotKey = [self _carbonHotKeyForHotKey: hotKey];
-	NSAssert( carbonHotKey != nil, @"" );
-	
-	err = UnregisterEventHotKey( carbonHotKey );
-	//Watch as we ignore 'err':
-	
-	key = [NSValue valueWithPointer: carbonHotKey];
-	[mHotKeys removeObjectForKey: key];
-	
-	[self _updateEventHandler];
-	
-	//See that? Completely ignored
-}
-*/
-
-- (RemoteControlEventIdentifier) remoteControlEventIdentifierForID: (unsigned int) id {
-	NSNumber* remoteEventIdentifier = [hotKeyRemoteEventMapping objectForKey:[NSNumber numberWithUnsignedInt: id]];
-	return [remoteEventIdentifier unsignedIntValue];
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
-	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
-}
-
-static RemoteControlEventIdentifier lastEvent;
-
-
-static OSStatus hotKeyEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEvent, void* userData )
-{
-	GlobalKeyboardDevice* keyboardDevice = (GlobalKeyboardDevice*) userData;
-	EventHotKeyID hkCom;
-	GetEventParameter(inEvent,kEventParamDirectObject,typeEventHotKeyID,NULL,sizeof(hkCom),NULL,&hkCom);
-
-	RemoteControlEventIdentifier identifier = [keyboardDevice remoteControlEventIdentifierForID:hkCom.id];
-	if (identifier == 0) return noErr;
-	
-	BOOL pressedDown = YES;
-	if (identifier != lastEvent) {
-		lastEvent = identifier;
-	} else {
-		lastEvent = 0;
-	    pressedDown = NO;
-	}
-	[keyboardDevice sendRemoteButtonEvent: identifier pressedDown: pressedDown];
-	
-	return noErr;
-}
-
- at end
diff --git a/apple_remote/HIDRemoteControlDevice.m b/apple_remote/HIDRemoteControlDevice.m
deleted file mode 100644
index 2cd7506..0000000
--- a/apple_remote/HIDRemoteControlDevice.m
+++ /dev/null
@@ -1,528 +0,0 @@
-/*****************************************************************************
- * HIDRemoteControlDevice.m
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "HIDRemoteControlDevice.h"
-
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <IOKit/IOKitLib.h>
-#import <IOKit/IOCFPlugIn.h>
-#import <IOKit/hid/IOHIDKeys.h>
-#import <Carbon/Carbon.h>
-
- at interface HIDRemoteControlDevice (PrivateMethods) 
-- (NSDictionary*) cookieToButtonMapping; // Creates the dictionary using the magics, depending on the remote
-- (IOHIDQueueInterface**) queue;
-- (IOHIDDeviceInterface**) hidDeviceInterface;
-- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues; 
-- (void) removeNotifcationObserver;
-- (void) remoteControlAvailable:(NSNotification *)notification;
-
- at end
-
- at interface HIDRemoteControlDevice (IOKitMethods) 
-+ (io_object_t) findRemoteDevice;
-- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice;
-- (BOOL) initializeCookies;
-- (BOOL) openDevice;
- at end
-
- at implementation HIDRemoteControlDevice
-
-+ (const char*) remoteControlDeviceName {
-	return "";
-}
-
-+ (BOOL) isRemoteAvailable {	
-	io_object_t hidDevice = [self findRemoteDevice];
-	if (hidDevice != 0) {
-		IOObjectRelease(hidDevice);
-		return YES;
-	} else {
-		return NO;		
-	}
-}
-
-- (id) initWithDelegate: (id) _remoteControlDelegate {	
-	if ([[self class] isRemoteAvailable] == NO) return nil;
-	
-	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
-		openInExclusiveMode = YES;
-		queue = NULL;
-		hidDeviceInterface = NULL;
-		cookieToButtonMapping = [[NSMutableDictionary alloc] init];
-		
-		[self setCookieMappingInDictionary: cookieToButtonMapping];
-
-		NSEnumerator* enumerator = [cookieToButtonMapping objectEnumerator];
-		NSNumber* identifier;
-		supportedButtonEvents = 0;
-		while( (identifier = [enumerator nextObject]) ) {
-			supportedButtonEvents |= [identifier intValue];
-		}
-		
-		fixSecureEventInputBug = [[NSUserDefaults standardUserDefaults] boolForKey: @"remoteControlWrapperFixSecureEventInputBug"];
-	}
-	
-	return self;
-}
-
-- (void) dealloc {
-	[self removeNotifcationObserver];
-	[self stopListening:self];
-	[cookieToButtonMapping release];
-	[super dealloc];
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
-	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
-}
-
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping {
-}
-- (int) remoteIdSwitchCookie {
-	return 0;
-}
-
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
-	return (supportedButtonEvents & identifier) == identifier;
-}
-	
-- (BOOL) isListeningToRemote {
-	return (hidDeviceInterface != NULL && allCookies != NULL && queue != NULL);	
-}
-
-- (void) setListeningToRemote: (BOOL) value {
-	if (value == NO) {
-		[self stopListening:self];
-	} else {
-		[self startListening:self];
-	}
-}
-
-- (BOOL) isOpenInExclusiveMode {
-	return openInExclusiveMode;
-}
-- (void) setOpenInExclusiveMode: (BOOL) value {
-	openInExclusiveMode = value;
-}
-
-- (BOOL) processesBacklog {
-	return processesBacklog;
-}
-- (void) setProcessesBacklog: (BOOL) value {
-	processesBacklog = value;
-}
-
-- (void) startListening: (id) sender {	
-	if ([self isListeningToRemote]) return;
-	
-	// 4th July 2007
-	// 
-	// A security update in february of 2007 introduced an odd behavior.
-	// Whenever SecureEventInput is activated or deactivated the exclusive access
-	// to the remote control device is lost. This leads to very strange behavior where
-	// a press on the Menu button activates FrontRow while your app still gets the event.
-	// A great number of people have complained about this.	
-	// 
-	// Enabling the SecureEventInput and keeping it enabled does the trick.
-	//
-	// I'm pretty sure this is a kind of bug at Apple and I'm in contact with the responsible
-	// Apple Engineer. This solution is not a perfect one - I know. 	
-	// One of the side effects is that applications that listen for special global keyboard shortcuts (like Quicksilver)
-	// may get into problems as they no longer get the events.
-	// As there is no official Apple Remote API from Apple I also failed to open a technical incident on this.
-	// 
-	// Note that there is a corresponding DisableSecureEventInput in the stopListening method below.
-	// 
-	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) EnableSecureEventInput();	
-	
-	[self removeNotifcationObserver];
-	
-	io_object_t hidDevice = [[self class] findRemoteDevice];
-	if (hidDevice == 0) return;
-	
-	if ([self createInterfaceForDevice:hidDevice] == NULL) {
-		goto error;
-	}
-	
-	if ([self initializeCookies]==NO) {
-		goto error;
-	}
-
-	if ([self openDevice]==NO) {
-		goto error;
-	}
-	// be KVO friendly
-	[self willChangeValueForKey:@"listeningToRemote"];
-	[self didChangeValueForKey:@"listeningToRemote"];
-	goto cleanup;
-	
-error:
-	[self stopListening:self];
-	DisableSecureEventInput();
-	
-cleanup:	
-	IOObjectRelease(hidDevice);	
-}
-
-- (void) stopListening: (id) sender {
-	if ([self isListeningToRemote]==NO) return;
-	
-	BOOL sendNotification = NO;
-	
-	if (eventSource != NULL) {
-		CFRunLoopRemoveSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
-		CFRelease(eventSource);
-		eventSource = NULL;
-	}
-	if (queue != NULL) {
-		(*queue)->stop(queue);		
-		
-		//dispose of queue
-		(*queue)->dispose(queue);		
-		
-		//release the queue we allocated
-		(*queue)->Release(queue);	
-		
-		queue = NULL;
-		
-		sendNotification = YES;
-	}
-	
-	if (allCookies != nil) {
-		[allCookies autorelease];
-		allCookies = nil;
-	}
-	
-	if (hidDeviceInterface != NULL) {
-		//close the device
-		(*hidDeviceInterface)->close(hidDeviceInterface);
-		
-		//release the interface	
-		(*hidDeviceInterface)->Release(hidDeviceInterface);
-		
-		hidDeviceInterface = NULL;
-	}
-	
-	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) DisableSecureEventInput();
-	
-	if ([self isOpenInExclusiveMode] && sendNotification) {
-		[[self class] sendFinishedNotifcationForAppIdentifier: nil];		
-	}
-	// be KVO friendly
-	[self willChangeValueForKey:@"listeningToRemote"];
-	[self didChangeValueForKey:@"listeningToRemote"];	
-}
-
- at end
-
- at implementation HIDRemoteControlDevice (PrivateMethods) 
-
-- (IOHIDQueueInterface**) queue {
-	return queue;
-}
-
-- (IOHIDDeviceInterface**) hidDeviceInterface {
-	return hidDeviceInterface;
-}
-
-
-- (NSDictionary*) cookieToButtonMapping {
-	return cookieToButtonMapping;
-}
-
-- (NSString*) validCookieSubstring: (NSString*) cookieString {
-	if (cookieString == nil || [cookieString length] == 0) return nil;
-	NSEnumerator* keyEnum = [[self cookieToButtonMapping] keyEnumerator];
-	NSString* key;
-	while( (key = [keyEnum nextObject]) ) {
-		NSRange range = [cookieString rangeOfString:key];
-		if (range.location == 0) return key; 
-	}
-	return nil;
-}
-
-- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues {
-	/*
-	if (previousRemainingCookieString) {
-		cookieString = [previousRemainingCookieString stringByAppendingString: cookieString];
-		NSLog(@"New cookie string is %@", cookieString);
-		[previousRemainingCookieString release], previousRemainingCookieString=nil;							
-	}*/
-	if (cookieString == nil || [cookieString length] == 0) return;
-		
-	NSNumber* buttonId = [[self cookieToButtonMapping] objectForKey: cookieString];
-	if (buttonId != nil) {
-       switch ( (int)buttonId )
-       {
-       case kMetallicRemote2009ButtonPlay:
-       case kMetallicRemote2009ButtonMiddlePlay:
-           buttonId = [NSNumber numberWithInt:kRemoteButtonPlay];
-           break;
-       default:
-           break;
-       }
-       [self sendRemoteButtonEvent: [buttonId intValue] pressedDown: (sumOfValues>0)];
-
-	} else {
-		// let's see if a number of events are stored in the cookie string. this does
-		// happen when the main thread is too busy to handle all incoming events in time.
-		NSString* subCookieString;
-		NSString* lastSubCookieString=nil;
-		while( (subCookieString = [self validCookieSubstring: cookieString]) ) {
-			cookieString = [cookieString substringFromIndex: [subCookieString length]];
-			lastSubCookieString = subCookieString;
-			if (processesBacklog) [self handleEventWithCookieString: subCookieString sumOfValues:sumOfValues];
-		}
-		if (processesBacklog == NO && lastSubCookieString != nil) {
-			// process the last event of the backlog and assume that the button is not pressed down any longer.
-			// The events in the backlog do not seem to be in order and therefore (in rare cases) the last event might be 
-			// a button pressed down event while in reality the user has released it. 
-			// NSLog(@"processing last event of backlog");
-			[self handleEventWithCookieString: lastSubCookieString sumOfValues:0];
-		}
-		if ([cookieString length] > 0) {
-			NSLog(@"Unknown button for cookiestring %@", cookieString);
-		}		
-	}
-}
-
-- (void) removeNotifcationObserver {
-	[[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
-}
-
-- (void) remoteControlAvailable:(NSNotification *)notification {
-	[self removeNotifcationObserver];
-	[self startListening: self];
-}
-
- at end
-
-/*	Callback method for the device queue
-Will be called for any event of any type (cookie) to which we subscribe
-*/
-static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon, void* sender) {	
-	if (target < 0) {
-		NSLog(@"QueueCallbackFunction called with invalid target!");
-		return;
-	}
-	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-	
-	HIDRemoteControlDevice* remote = (HIDRemoteControlDevice*)target;	
-	IOHIDEventStruct event;	
-	AbsoluteTime 	 zeroTime = {0,0};
-	NSMutableString* cookieString = [NSMutableString string];
-	SInt32			 sumOfValues = 0;
-	while (result == kIOReturnSuccess)
-	{
-		result = (*[remote queue])->getNextEvent([remote queue], &event, zeroTime, 0);		
-		if ( result != kIOReturnSuccess )
-			continue;
-	
-		//printf("%d %d %d\n", event.elementCookie, event.value, event.longValue);		
-		
-		if (((int)event.elementCookie)!=5) {
-			sumOfValues+=event.value;
-			[cookieString appendString:[NSString stringWithFormat:@"%d_", event.elementCookie]];
-		}
-	}
-	[remote handleEventWithCookieString: cookieString sumOfValues: sumOfValues];
-	
-	[pool release];
-}
-
- at implementation HIDRemoteControlDevice (IOKitMethods)
-
-- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice {
-	io_name_t				className;
-	IOCFPlugInInterface**   plugInInterface = NULL;
-	HRESULT					plugInResult = S_OK;
-	SInt32					score = 0;
-	IOReturn				ioReturnValue = kIOReturnSuccess;
-	
-	hidDeviceInterface = NULL;
-	
-	ioReturnValue = IOObjectGetClass(hidDevice, className);
-	
-	if (ioReturnValue != kIOReturnSuccess) {
-		NSLog(@"Error: Failed to get class name.");
-		return NULL;
-	}
-	
-	ioReturnValue = IOCreatePlugInInterfaceForService(hidDevice,
-													  kIOHIDDeviceUserClientTypeID,
-													  kIOCFPlugInInterfaceID,
-													  &plugInInterface,
-													  &score);
-	if (ioReturnValue == kIOReturnSuccess)
-	{
-		//Call a method of the intermediate plug-in to create the device interface
-		plugInResult = (*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) &hidDeviceInterface);
-		
-		if (plugInResult != S_OK) {
-			NSLog(@"Error: Couldn't create HID class device interface");
-		}
-		// Release
-		if (plugInInterface) (*plugInInterface)->Release(plugInInterface);
-	}
-	return hidDeviceInterface;
-}
-
-- (BOOL) initializeCookies {
-	IOHIDDeviceInterface122** handle = (IOHIDDeviceInterface122**)hidDeviceInterface;
-	IOHIDElementCookie		cookie;
-	long					usage;
-	long					usagePage;
-	id						object;
-	NSArray*				elements = nil;
-	NSDictionary*			element;
-	IOReturn success;
-	
-	if (!handle || !(*handle)) return NO;
-	
-	// Copy all elements, since we're grabbing most of the elements
-	// for this device anyway, and thus, it's faster to iterate them
-	// ourselves. When grabbing only one or two elements, a matching
-	// dictionary should be passed in here instead of NULL.
-	success = (*handle)->copyMatchingElements(handle, NULL, (CFArrayRef*)&elements);
-	
-	if (success == kIOReturnSuccess) {
-		
-		[elements autorelease];		
-		/*
-		cookies = calloc(NUMBER_OF_APPLE_REMOTE_ACTIONS, sizeof(IOHIDElementCookie)); 
-		memset(cookies, 0, sizeof(IOHIDElementCookie) * NUMBER_OF_APPLE_REMOTE_ACTIONS);
-		*/
-		allCookies = [[NSMutableArray alloc] init];
-		
-		NSEnumerator *elementsEnumerator = [elements objectEnumerator];
-		
-		while ( (element = [elementsEnumerator nextObject]) ) {						
-			//Get cookie
-			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementCookieKey) ];
-			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;
-			if (object == 0 || CFGetTypeID(object) != CFNumberGetTypeID()) continue;
-			cookie = (IOHIDElementCookie) [object longValue];
-			
-			//Get usage
-			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsageKey) ];
-			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
-			usage = [object longValue];
-			
-			//Get usage page
-			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsagePageKey) ];
-			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
-			usagePage = [object longValue];
-
-			[allCookies addObject: [NSNumber numberWithInt:(int)cookie]];
-		}
-	} else {
-		return NO;
-	}
-	
-	return YES;
-}
-
-- (BOOL) openDevice {
-	HRESULT  result;
-	
-	IOHIDOptionsType openMode = kIOHIDOptionsTypeNone;
-	if ([self isOpenInExclusiveMode]) openMode = kIOHIDOptionsTypeSeizeDevice;	
-	IOReturn ioReturnValue = (*hidDeviceInterface)->open(hidDeviceInterface, openMode);	
-	
-	if (ioReturnValue == KERN_SUCCESS) {		
-		queue = (*hidDeviceInterface)->allocQueue(hidDeviceInterface);
-		if (queue) {
-			result = (*queue)->create(queue, 0, 12);	//depth: maximum number of elements in queue before oldest elements in queue begin to be lost.
-
-			IOHIDElementCookie cookie;
-			NSEnumerator *allCookiesEnumerator = [allCookies objectEnumerator];
-			
-			while ( (cookie = (IOHIDElementCookie)[[allCookiesEnumerator nextObject] intValue]) ) {
-				(*queue)->addElement(queue, cookie, 0);
-			}
-									  
-			// add callback for async events			
-			ioReturnValue = (*queue)->createAsyncEventSource(queue, &eventSource);			
-			if (ioReturnValue == KERN_SUCCESS) {
-				ioReturnValue = (*queue)->setEventCallout(queue,QueueCallbackFunction, self, NULL);
-				if (ioReturnValue == KERN_SUCCESS) {
-					CFRunLoopAddSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
-					
-					//start data delivery to queue
-					(*queue)->start(queue);	
-					return YES;
-				} else {
-					NSLog(@"Error when setting event callback");
-				}
-			} else {
-				NSLog(@"Error when creating async event source");
-			}
-		} else {
-			NSLog(@"Error when opening device");
-		}
-	} else if (ioReturnValue == kIOReturnExclusiveAccess) {
-		// the device is used exclusive by another application
-		
-		// 1. we register for the FINISHED_USING_REMOTE_CONTROL_NOTIFICATION notification
-		[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(remoteControlAvailable:) name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
-		
-		// 2. send a distributed notification that we wanted to use the remote control				
-		[[self class] sendRequestForRemoteControlNotification];
-	}
-	return NO;				
-}
-
-+ (io_object_t) findRemoteDevice {
-	CFMutableDictionaryRef hidMatchDictionary = NULL;
-	IOReturn ioReturnValue = kIOReturnSuccess;	
-	io_iterator_t hidObjectIterator = 0;
-	io_object_t	hidDevice = 0;
-	
-	// Set up a matching dictionary to search the I/O Registry by class
-	// name for all HID class devices
-	hidMatchDictionary = IOServiceMatching([self remoteControlDeviceName]);
-	
-	// Now search I/O Registry for matching devices.
-	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
-	
-	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
-		hidDevice = IOIteratorNext(hidObjectIterator);
-	}
-	
-	// release the iterator
-	IOObjectRelease(hidObjectIterator);
-	
-	return hidDevice;
-}
-
- at end
-
diff --git a/apple_remote/KeyspanFrontRowControl.m b/apple_remote/KeyspanFrontRowControl.m
deleted file mode 100644
index dd86475..0000000
--- a/apple_remote/KeyspanFrontRowControl.m
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * KeyspanFrontRowControl.m
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
- 
-#import "KeyspanFrontRowControl.h"
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <IOKit/IOKitLib.h>
-#import <IOKit/IOCFPlugIn.h>
-#import <IOKit/hid/IOHIDKeys.h>
-
- at implementation KeyspanFrontRowControl
-
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		 forKey:@"11_18_99_10_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		 forKey:@"11_18_98_10_"];		
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		 forKey:@"11_18_58_10_"];		
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		 forKey:@"11_18_61_10_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		 forKey:@"11_18_96_10_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		 forKey:@"11_18_97_10_"];
-	/* hold events are not being send by this device
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Sleep]	forKey:@"18_14_6_18_14_6_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	*/
-}
-
-+ (io_object_t) findRemoteDevice {
-	CFMutableDictionaryRef hidMatchDictionary = NULL;
-	IOReturn ioReturnValue = kIOReturnSuccess;	
-	io_iterator_t hidObjectIterator = 0;
-	io_object_t	hidDevice = 0;
-	SInt32                  idVendor = 1741;
-	SInt32                  idProduct = 0x420;	
-	
-	// Set up a matching dictionary to search the I/O Registry by class
-	// name for all HID class devices
-	hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
-	
-	CFNumberRef numberRefVendor = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idVendor);
-    if ( numberRefVendor )
-    {
-        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDVendorIDKey), numberRefVendor);
-        CFRelease(numberRefVendor);
-	}
-
-    CFNumberRef numberRefProduct = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idProduct);
-    if ( numberRefProduct )
-    {
-        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDProductIDKey), numberRefProduct);
-        CFRelease(numberRefProduct);	
-	}
-
-	// Now search I/O Registry for matching devices.
-	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
-	
-	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
-		hidDevice = IOIteratorNext(hidObjectIterator);
-	}
-	
-	// release the iterator
-    if ( hidObjectIterator )
-        IOObjectRelease(hidObjectIterator);
-
-	return hidDevice;
-	
-}
-
- at end
diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk
new file mode 100644
index 0000000..308725c
--- /dev/null
+++ b/apple_remote/Library_AppleRemote.mk
@@ -0,0 +1,58 @@
+
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Norbert Thiebaud <nthiebaud at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2012 the
+# Initial Developer. All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,AppleRemote))
+
+$(eval $(call gb_Library_set_include,AppleRemote,\
+    -I$(SRCDIR)/apple_remote/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_externals,AppleRemote,\
+    cocoa \
+    carbon \
+    iokit \
+))
+
+$(eval $(call gb_Library_add_libs,AppleRemote,\
+    -framework Cocoa \
+    -framework Carbon \
+    -framework IOKit \
+))
+
+$(eval $(call gb_Library_add_objcobjects,AppleRemote,\
+    apple_remote/source/KeyspanFrontRowControl \
+    apple_remote/source/AppleRemote \
+    apple_remote/source/RemoteControl \
+    apple_remote/source/RemoteControlContainer \
+    apple_remote/source/GlobalKeyboardDevice \
+    apple_remote/source/HIDRemoteControlDevice \
+    apple_remote/source/MultiClickRemoteBehavior \
+    apple_remote/source/RemoteMainController \
+))
diff --git a/apple_remote/Makefile b/apple_remote/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/apple_remote/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk
new file mode 100644
index 0000000..4b0a691
--- /dev/null
+++ b/apple_remote/Module_apple_remote.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Norbert Thiebaud <nthiebaud at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2012 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,apple_remote))
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,apple_remote,\
+    Library_AppleRemote \
+    Package_inc \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/apple_remote/MultiClickRemoteBehavior.m b/apple_remote/MultiClickRemoteBehavior.m
deleted file mode 100644
index d0fd34c..0000000
--- a/apple_remote/MultiClickRemoteBehavior.m
+++ /dev/null
@@ -1,213 +0,0 @@
-/*****************************************************************************
- * MultiClickRemoteBehavior.m
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "MultiClickRemoteBehavior.h"
-
-const NSTimeInterval DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE = 0.35;
-const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4;
-
- at implementation MultiClickRemoteBehavior
-
-- (id) init {
-	if ( (self = [super init]) ) {
-		maxClickTimeDifference = DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE;
-	}
-	return self;
-}
-
-// Delegates are not retained!
-// http://developer.apple.com/documentation/Cocoa/Conceptual/CocoaFundamentals/CommunicatingWithObjects/chapter_6_section_4.html
-// Delegating objects do not (and should not) retain their delegates. 
-// However, clients of delegating objects (applications, usually) are responsible for ensuring that their delegates are around
-// to receive delegation messages. To do this, they may have to retain the delegate.
-- (void) setDelegate: (id) _delegate {
-	if ( _delegate && ( [_delegate respondsToSelector:@selector(remoteButton:pressedDown:clickCount:)] == NO )) return; // return what ?
-	
-	delegate = _delegate;
-}
-- (id) delegate {
-	return delegate;
-}
-
-- (BOOL) simulateHoldEvent {
-	return simulateHoldEvents;
-}
-- (void) setSimulateHoldEvent: (BOOL) value {
-	simulateHoldEvents = value;
-}
-
-- (BOOL) simulatesHoldForButtonIdentifier: (RemoteControlEventIdentifier) identifier remoteControl: (RemoteControl*) remoteControl {
-	// we do that check only for the normal button identifiers as we would check for hold support for hold events instead
-	if (identifier > (1 << EVENT_TO_HOLD_EVENT_OFFSET)) return NO; 
-	
-	return [self simulateHoldEvent] && [remoteControl sendsEventForButtonIdentifier: (identifier << EVENT_TO_HOLD_EVENT_OFFSET)]==NO;
-}
-
-- (BOOL) clickCountingEnabled {
-	return clickCountEnabledButtons != 0;
-}
-- (void) setClickCountingEnabled: (BOOL) value {
-	if (value) {
-       [self setClickCountEnabledButtons: kRemoteButtonPlus | kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight | kRemoteButtonMenu | kMetallicRemote2009ButtonPlay | kMetallicRemote2009ButtonMiddlePlay];
-	} else {
-		[self setClickCountEnabledButtons: 0];
-	}
-}
-
-- (unsigned int) clickCountEnabledButtons {
-	return clickCountEnabledButtons;
-}
-- (void) setClickCountEnabledButtons: (unsigned int)value {
-	clickCountEnabledButtons = value;
-}
-
-- (NSTimeInterval) maximumClickCountTimeDifference {
-	return maxClickTimeDifference;
-}
-- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff {
-	maxClickTimeDifference = timeDiff;
-}
-
-- (void) sendSimulatedHoldEvent: (id) time {
-	BOOL startSimulateHold = NO;
-	RemoteControlEventIdentifier event = lastHoldEvent;
-	@synchronized(self) {
-		startSimulateHold = (lastHoldEvent>0 && lastHoldEventTime == [time doubleValue]);
-	}
-	if (startSimulateHold) {
-		lastEventSimulatedHold = YES;
-		event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
-		[delegate remoteButton:event pressedDown: YES clickCount: 1];
-	}
-}
-
-- (void) executeClickCountEvent: (NSArray*) values {
-	RemoteControlEventIdentifier event = [[values objectAtIndex: 0] unsignedIntValue]; 
-	NSTimeInterval eventTimePoint = [[values objectAtIndex: 1] doubleValue];
-	
-	BOOL finishedClicking = NO;
-	int finalClickCount = eventClickCount;	
-	
-	@synchronized(self) {
-		finishedClicking = (event != lastClickCountEvent || eventTimePoint == lastClickCountEventTime);
-		if (finishedClicking) {
-			eventClickCount = 0;		
-			lastClickCountEvent = 0;
-			lastClickCountEventTime = 0;
-		}
-	}
-	
-	if (finishedClicking) {	
-		[delegate remoteButton:event pressedDown: YES clickCount:finalClickCount];		
-		// trigger a button release event, too
-		[NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow:0.1]];
-		[delegate remoteButton:event pressedDown: NO clickCount:finalClickCount];
-	}
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl {	
-	if (!delegate)  return;
-	
-	BOOL clickCountingForEvent = ([self clickCountEnabledButtons] & event) == event;
-
-	if ([self simulatesHoldForButtonIdentifier: event remoteControl: remoteControl] && lastClickCountEvent==0) {
-		if (pressedDown) {
-			// wait to see if it is a hold
-			lastHoldEvent = event;
-			lastHoldEventTime = [NSDate timeIntervalSinceReferenceDate];
-			[self performSelector:@selector(sendSimulatedHoldEvent:) 
-					   withObject:[NSNumber numberWithDouble:lastHoldEventTime]
-					   afterDelay:HOLD_RECOGNITION_TIME_INTERVAL];
-			return;
-		} else {
-			if (lastEventSimulatedHold) {
-				// it was a hold
-				// send an event for "hold release"
-				event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
-				lastHoldEvent = 0;
-				lastEventSimulatedHold = NO;
-
-				[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
-				return;
-			} else {
-				RemoteControlEventIdentifier previousEvent = lastHoldEvent;
-				@synchronized(self) {
-					lastHoldEvent = 0;
-				}						
-				
-				// in case click counting is enabled we have to setup the state for that, too
-				if (clickCountingForEvent) {
-					lastClickCountEvent = previousEvent;
-					lastClickCountEventTime = lastHoldEventTime;
-					NSNumber* eventNumber;
-					NSNumber* timeNumber;		
-					eventClickCount = 1;
-					timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
-					eventNumber= [NSNumber numberWithUnsignedInt:previousEvent];
-					NSTimeInterval diffTime = maxClickTimeDifference-([NSDate timeIntervalSinceReferenceDate]-lastHoldEventTime);
-					[self performSelector: @selector(executeClickCountEvent:) 
-							   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
-							   afterDelay: diffTime];							
-					// we do not return here because we are still in the press-release event
-					// that will be consumed below
-				} else {
-					// trigger the pressed down event that we consumed first
-					[delegate remoteButton:event pressedDown: YES clickCount:1];							
-				}
-			}										
-		}
-	}
-	
-	if (clickCountingForEvent) {
-		if (pressedDown == NO) return;
-
-		NSNumber* eventNumber;
-		NSNumber* timeNumber;
-		@synchronized(self) {
-			lastClickCountEventTime = [NSDate timeIntervalSinceReferenceDate];
-			if (lastClickCountEvent == event) {
-				eventClickCount = eventClickCount + 1;
-			} else {
-				eventClickCount = 1;
-			}
-			lastClickCountEvent = event;
-			timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
-			eventNumber= [NSNumber numberWithUnsignedInt:event];
-		}
-		[self performSelector: @selector(executeClickCountEvent:) 
-				   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
-				   afterDelay: maxClickTimeDifference];
-	} else {
-		[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
-	}		
-
-}
-
- at end
diff --git a/apple_remote/Package_inc.mk b/apple_remote/Package_inc.mk
new file mode 100644
index 0000000..f6e61ef
--- /dev/null
+++ b/apple_remote/Package_inc.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Norbert Thiebaud <nthiebaud at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2012 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,apple_remote_inc,$(SRCDIR)/apple_remote/inc))
+
+$(eval $(call gb_Package_add_file,apple_remote_inc,inc/apple_remote/RemoteControl.h,apple_remote/RemoteControl.h))
+$(eval $(call gb_Package_add_file,apple_remote_inc,inc/apple_remote/RemoteMainController.h,apple_remote/RemoteMainController.h))
+
diff --git a/apple_remote/RemoteControl.m b/apple_remote/RemoteControl.m
deleted file mode 100644
index d0812d3..0000000
--- a/apple_remote/RemoteControl.m
+++ /dev/null
@@ -1,146 +0,0 @@
-/*****************************************************************************
- * RemoteControl.m
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
- 
-#import "RemoteControl.h"
-
-// notifaction names that are being used to signal that an application wants to 
-// have access to the remote control device or if the application has finished
-// using the remote control device
-NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION     = @"mac.remotecontrols.RequestForRemoteControl";
-NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION = @"mac.remotecontrols.FinishedUsingRemoteControl";
-
-// keys used in user objects for distributed notifications
-NSString* kRemoteControlDeviceName = @"RemoteControlDeviceName";
-NSString* kApplicationIdentifier   = @"CFBundleIdentifier";
-// bundle identifier of the application that should get access to the remote control
-// this key is being used in the FINISHED notification only
-NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
-
-
- at implementation RemoteControl
-
-// returns nil if the remote control device is not available
-- (id) initWithDelegate: (id) _remoteControlDelegate {	
-	if ( (self = [super init]) ) {
-		delegate = [_remoteControlDelegate retain];
-#ifdef DEBUG
-        NSLog(@"RemoteControl initWithDelegate ok");
-#endif
-    }
-	return self;
-}
-
-- (void) dealloc {
-	[delegate release];
-	[super dealloc];
-}
-
-- (void) setListeningToRemote: (BOOL) value {
-#ifdef DEBUG
-        NSLog(@"setListeningToRemote ok");
-#endif
-}
-- (BOOL) isListeningToRemote {
-	return NO;
-}
-
-- (void) startListening: (id) sender {
-#ifdef DEBUG
-            NSLog(@"startListening ok");
-#endif
-}
-- (void) stopListening: (id) sender {
-#ifdef DEBUG
-            NSLog(@"stopListening ok");
-#endif
-}
-
-- (BOOL) isOpenInExclusiveMode {
-	return YES;
-}
-- (void) setOpenInExclusiveMode: (BOOL) value {
-}
-
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
-#ifdef DEBUG
-   NSLog(@"sending event for button identifier \n");
-#endif
-	return YES;
-}
-
-+ (void) sendDistributedNotification: (NSString*) notificationName targetBundleIdentifier: (NSString*) targetIdentifier
-{
-    if ( (self = [super init]) ) {
-    NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithCString:[self remoteControlDeviceName] encoding:NSASCIIStringEncoding],
-                            kRemoteControlDeviceName /* key = RemoteControlDeviceName  -> OK */,
-                            [[NSBundle mainBundle] bundleIdentifier] /* value = org.openoffice.script -> OK */,
-                            kApplicationIdentifier/* key = CFBundleIdentifier -> OK */,
-                            targetIdentifier /*value = AppleIRController -> OK */,
-                            kTargetApplicationIdentifier /*targetBundleIdentifier -> does not appear, since the peer is nil*/,
-                            nil];
-#ifdef DEBUG
-    // Debug purpose: returns all the existing dictionary keys. 
-    NSString *s;
-    NSEnumerator *e = [userInfo keyEnumerator];
-    while ( (s = [e nextObject]) ) {
-        NSLog(@"key = %@ ",s);
-    }
-    NSEnumerator *f = [userInfo objectEnumerator ];
-    while ( (s = [f nextObject]) ) {
-        NSLog(@"value = %@ ",s);
-    }
-    NSLog(@"sendDistributedNotification ...");
-#endif
-
-	[[NSDistributedNotificationCenter defaultCenter] postNotificationName:notificationName
-																   object:nil
-																 userInfo:userInfo
-													   deliverImmediately:YES];	
-    }
-}
-
-+ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
-    [self sendDistributedNotification:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION targetBundleIdentifier:identifier];
-#ifdef DEBUG
-    NSLog(@"sendFinishedNotifcationForAppIdentifier ...");
-#endif
-}
-+ (void) sendRequestForRemoteControlNotification {
-    [self sendDistributedNotification:REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION targetBundleIdentifier:nil];
-#ifdef DEBUG
-    NSLog(@"sendRequestForRemoteControlNotification ...");
-#endif
-}
-
-+ (const char*) remoteControlDeviceName {
-	return NULL;
-}
-
- at end
diff --git a/apple_remote/RemoteControlContainer.m b/apple_remote/RemoteControlContainer.m
deleted file mode 100644
index 40a222f..0000000
--- a/apple_remote/RemoteControlContainer.m
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************
- * RemoteControlContainer.m
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "RemoteControlContainer.h"
-
- at implementation RemoteControlContainer
-
-- (id) initWithDelegate: (id) _remoteControlDelegate {
-	if ( (self = [super initWithDelegate:_remoteControlDelegate]) ) {
-		remoteControls = [[NSMutableArray alloc] init];
-#ifdef DEBUG
-        NSLog(@"RemoteControlContainer initWithDelegate ok");
-	}
-    else {
-        NSLog(@"RemoteControlContainer initWithDelegate failed");
-#endif
-    }
-
-	return self;
-}
-
-- (void) dealloc {
-	[self stopListening: self];
-	[remoteControls release];
-	[super dealloc];
-}
-
-- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz {
-    BOOL toReturn = NO;
-    RemoteControl* remoteControl = [[clazz alloc] initWithDelegate: delegate];
-    if (remoteControl) {
-        [remoteControls addObject: remoteControl];
-        [remoteControl addObserver: self forKeyPath:@"listeningToRemote" options:NSKeyValueObservingOptionNew context:nil];
-        toReturn = YES;		
-    }
-#ifdef DEBUG
-    else {
-        NSLog(@"RemoteControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
-        toReturn = NO;	
-    }
-#endif
-    return toReturn;
-}
-
-- (unsigned int) count {
-	return [remoteControls count];
-}
-
-- (void) reset {
-	[self willChangeValueForKey:@"listeningToRemote"];
-	[self didChangeValueForKey:@"listeningToRemote"];
-#ifdef DEBUG
-	// debug purpose
-    NSLog(@"reset... (after listening to remote)");
-#endif
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-	[self reset];
-}
-
-- (void) setListeningToRemote: (BOOL) value {
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] setListeningToRemote: value];
-	}
-	if (value && value != [self isListeningToRemote]) [self performSelector:@selector(reset) withObject:nil afterDelay:0.01];
-}
-- (BOOL) isListeningToRemote {
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		if ([[remoteControls objectAtIndex: i] isListeningToRemote]) {
-			return YES;
-		}
-	}
-	return NO;
-}
-
-- (void) startListening: (id) sender {
-#ifdef DEBUG
-	NSLog(@"startListening to events... ");
-#endif
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] startListening: sender];
-	}	
-}
-- (void) stopListening: (id) sender {
-#ifdef DEBUG
-	NSLog(@"stopListening to events... ");
-#endif
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] stopListening: sender];
-	}	
-}
-
-- (BOOL) isOpenInExclusiveMode {
-	BOOL mode = YES;
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		mode = mode && ([[remoteControls objectAtIndex: i] isOpenInExclusiveMode]);
-	}
-	return mode;	
-}
-- (void) setOpenInExclusiveMode: (BOOL) value {
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] setOpenInExclusiveMode:value];
-	}	
-}
-
- at end
diff --git a/apple_remote/RemoteMainController.m b/apple_remote/RemoteMainController.m
deleted file mode 100644
index c3da7bb..0000000
--- a/apple_remote/RemoteMainController.m
+++ /dev/null
@@ -1,168 +0,0 @@
-/*****************************************************************************
- * RemoteMainController.m
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "RemoteMainController.h"
-#import "AppleRemote.h"
-#import "KeyspanFrontRowControl.h"
-#import "GlobalKeyboardDevice.h"
-#import "RemoteControlContainer.h"
-#import "MultiClickRemoteBehavior.h"
-
-// -------------------------------------------------------------------------------------------
-// Sample Code 3: Multi Click Behavior and Hold Event Simulation
-// -------------------------------------------------------------------------------------------
-
- at implementation MainController
-
-- (id) init {
-    self = [super init];  // because we redefined our own init instead of use the fu..nny awakeFromNib 
-    if (self != nil) {
-
-        // 1. instantiate the desired behavior for the remote control device
-        remoteControlBehavior = [[MultiClickRemoteBehavior alloc] init];	
-
-        // 2. configure the behavior
-        [remoteControlBehavior setDelegate: self];
-		
-        // 3. a Remote Control Container manages a number of devices and conforms to the RemoteControl interface
-        //    Therefore you can enable or disable all the devices of the container with a single "startListening:" call.
-        RemoteControlContainer* container = [[RemoteControlContainer alloc] initWithDelegate: remoteControlBehavior];
-
-        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] != 0 ) {
-#ifdef DEBUG
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] successfull");
-        }
-        else {
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] failed");
-#endif
-        }
-
-        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] != 0 ) {
-#ifdef DEBUG
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] successfull");
-        }
-        else {
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] failed");
-#endif
-        }	
-        // to give the binding mechanism a chance to see the change of the attribute
-        [self setValue: container forKey: @"remoteControl"];	
-#ifdef DEBUG
-            NSLog(@"MainController init done");
-#endif
-    }
-    else 
-        NSLog(@"MainController init failed");
-    return self;
-}
-
-- (void) postTheEvent: (short int)buttonIdentifier modifierFlags:(int)modifierFlags
-{
-    [NSApp postEvent: 
-    [NSEvent    otherEventWithType:NSApplicationDefined
-                location:NSZeroPoint
-                modifierFlags:modifierFlags
-                timestamp: 0
-                windowNumber:[[NSApp keyWindow] windowNumber]
-                context:nil
-                subtype:AppleRemoteControlEvent
-                data1: buttonIdentifier 
-                data2: 0]
-    atStart: NO];
-}
-
-
-- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int)clickCount
-{
-    NSString* pressed = @"";
-#ifdef DEBUG
-    NSString* buttonName = nil;
-#endif
-    if (pressedDown)
-    {
-        pressed = @"(pressed)";
-
-#ifdef DEBUG
-        switch(buttonIdentifier) 
-        {
-            case kRemoteButtonPlus:         buttonName = @"Volume up";              break;  // MEDIA_COMMAND_VOLUME_UP  ( see vcl/inc/vcl/cmdevt.hxx )
-            case kRemoteButtonMinus:        buttonName = @"Volume down";            break;  // MEDIA_COMMAND_VOLUME_DOWN
-            case kRemoteButtonMenu:         buttonName = @"Menu";                   break;  // MEDIA_COMMAND_MENU
-            case kRemoteButtonPlay:         buttonName = @"Play";                   break;  // MEDIA_COMMAND_PLAY
-            case kRemoteButtonRight:        buttonName = @"Next slide";             break;  // MEDIA_COMMAND_NEXTTRACK
-            case kRemoteButtonLeft:         buttonName = @"Left";                   break;  // MEDIA_COMMAND_PREVIOUSTRACK
-            case kRemoteButtonRight_Hold:   buttonName = @"Last slide";             break;  // MEDIA_COMMAND_NEXTTRACK_HOLD
-            case kRemoteButtonLeft_Hold:    buttonName = @"First slide";            break;  // MEDIA_COMMAND_PREVIOUSTRACK_HOLD
-            case kRemoteButtonPlus_Hold:    buttonName = @"Volume up holding";      break;
-            case kRemoteButtonMinus_Hold:   buttonName = @"Volume down holding";    break;
-            case kRemoteButtonPlay_Hold:    buttonName = @"Play (sleep mode)";      break;  // MEDIA_COMMAND_PLAY_HOLD
-            case kRemoteButtonMenu_Hold:    buttonName = @"Menu (long)";            break;  // MEDIA_COMMAND_MENU_HOLD
-            case kRemoteControl_Switched:   buttonName = @"Remote Control Switched";break;
-
-            default:    NSLog(@"Unmapped event for button %d", buttonIdentifier);   break;
-        }
-#endif
-        [ self postTheEvent:buttonIdentifier modifierFlags: 0 ];
-    }
-    else // not pressed
-    {
-        pressed = @"(released)";
-    }
-
-#ifdef DEBUG
-	//NSLog(@"Button %@ pressed %@", buttonName, pressed);
-	NSString* clickCountString = @"";
-	if (clickCount > 1) clickCountString = [NSString stringWithFormat: @"%d clicks", clickCount];
-	NSString* feedbackString = [NSString stringWithFormat:@"(Value:%4d) %@  %@ %@",buttonIdentifier, buttonName, pressed, clickCountString];
-
-	// print out events
-	NSLog(@"%@", feedbackString);
-
-    if (pressedDown == NO) printf("\n");
-	// simulate slow processing of events
-	// [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.5]];
-#endif
-}
-
-- (void) dealloc {
-    [remoteControl autorelease];
-	[remoteControlBehavior autorelease];
-	[super dealloc];
-}
-
-// for bindings access
-- (RemoteControl*) remoteControl {
-	return remoteControl;
-}
-
-- (MultiClickRemoteBehavior*) remoteBehavior {
-	return remoteControlBehavior;
-}
-
- at end
diff --git a/apple_remote/inc/AppleRemote.h b/apple_remote/inc/AppleRemote.h
deleted file mode 100644
index 509ddaa..0000000
--- a/apple_remote/inc/AppleRemote.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * RemoteControlWrapper.h
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#ifndef DID_DEFINE_SOME_FUTURE_TYPES
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
- at class CALayer;
- at class NSViewController;
-typedef int NSColorRenderingIntent;
-#define DID_DEFINE_SOME_FUTURE_TYPES
-#endif
-#endif
-
-#import <Cocoa/Cocoa.h>
-#import "HIDRemoteControlDevice.h"
-
-/*  Interacts with the Apple Remote Control HID device
-    The class is not thread safe
-*/
- at interface AppleRemote : HIDRemoteControlDevice {
-}
-
- at end
diff --git a/apple_remote/inc/GlobalKeyboardDevice.h b/apple_remote/inc/GlobalKeyboardDevice.h
deleted file mode 100644
index ad9c4f3..0000000
--- a/apple_remote/inc/GlobalKeyboardDevice.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * GlobalKeyboardDevice.h
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "RemoteControl.h"
-
-#import <Carbon/Carbon.h>
-
-
-/*
- This class registers for a number of global keyboard shortcuts to simulate a remote control
- */
-
- at interface GlobalKeyboardDevice : RemoteControl {
-
-    NSMutableDictionary* hotKeyRemoteEventMapping;
-    EventHandlerRef eventHandlerRef;
-
-}
-
-- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers;
-
-- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier;
-
-
-
- at end
diff --git a/apple_remote/inc/HIDRemoteControlDevice.h b/apple_remote/inc/HIDRemoteControlDevice.h
deleted file mode 100644
index 44e4d17..0000000
--- a/apple_remote/inc/HIDRemoteControlDevice.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * HIDRemoteControlDevice.h
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "RemoteControl.h"
-
-#import <IOKit/hid/IOHIDLib.h>
-
-/*
-    Base class for HID based remote control devices
- */
- at interface HIDRemoteControlDevice : RemoteControl {
-    IOHIDDeviceInterface** hidDeviceInterface; // see IOKit/hid/IOHIDLib.h
-    IOHIDQueueInterface**  queue;  // IOKit/hid/IOHIDLib.h
-    NSMutableArray*        allCookies;
-    NSMutableDictionary*   cookieToButtonMapping;
-    CFRunLoopSourceRef     eventSource;
-
-    BOOL fixSecureEventInputBug;
-    BOOL openInExclusiveMode;
-    BOOL processesBacklog;
-
-    int supportedButtonEvents;
-}
-
-// When your application needs to much time on the main thread when processing an event other events
-// may already be received which are put on a backlog. As soon as your main thread
-// has some spare time this backlog is processed and may flood your delegate with calls.
-// Backlog processing is turned off by default.
-- (BOOL) processesBacklog;
-- (void) setProcessesBacklog: (BOOL) value;
-
-// methods that should be overwritten by subclasses
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping;
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown;
-
-+ (BOOL) isRemoteAvailable;
-
- at end
diff --git a/apple_remote/inc/KeyspanFrontRowControl.h b/apple_remote/inc/KeyspanFrontRowControl.h
deleted file mode 100644
index 2469b58..0000000
--- a/apple_remote/inc/KeyspanFrontRowControl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * KeyspanFrontRowControl.h
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-
-#ifndef DID_DEFINE_SOME_FUTURE_TYPES
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
- at class CALayer;
- at class NSViewController;
-typedef int NSColorRenderingIntent;
-#define DID_DEFINE_SOME_FUTURE_TYPES
-#endif
-#endif
-
-#import <Cocoa/Cocoa.h>
-#import "HIDRemoteControlDevice.h"
-
-/*  Interacts with the Keyspan FrontRow Remote Control HID device
-    The class is not thread safe
-*/
- at interface KeyspanFrontRowControl : HIDRemoteControlDevice {
-
-}
-
- at end
diff --git a/apple_remote/inc/MultiClickRemoteBehavior.h b/apple_remote/inc/MultiClickRemoteBehavior.h
deleted file mode 100644
index a704feb..0000000
--- a/apple_remote/inc/MultiClickRemoteBehavior.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*****************************************************************************
- * MultiClickRemoteBehavior.h
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-
-#import "RemoteControl.h"
-
-/**
-    A behavior that adds multiclick and hold events on top of a device.
-    Events are generated and send to a delegate
- */
- at interface MultiClickRemoteBehavior : NSObject {
-    id delegate;
-
-    // state for simulating plus/minus hold
-    BOOL simulateHoldEvents;
-    BOOL lastEventSimulatedHold;
-    RemoteControlEventIdentifier lastHoldEvent;
-    NSTimeInterval lastHoldEventTime;
-
-    // state for multi click
-    unsigned int clickCountEnabledButtons;
-    NSTimeInterval maxClickTimeDifference;
-    NSTimeInterval lastClickCountEventTime;
-    RemoteControlEventIdentifier lastClickCountEvent;
-    unsigned int eventClickCount;
-}
-
-- (id) init;
-
-// Delegates are not retained
-- (void) setDelegate: (id) delegate;
-- (id) delegate;
-
-// Simulating hold events does deactivate sending of individual requests for pressed down/released.
-// Instead special hold events are being triggered when the user is pressing and holding a button for a small period.
-// Simulation is activated only for those buttons and remote control that do not have a seperate event already
-- (BOOL) simulateHoldEvent;
-- (void) setSimulateHoldEvent: (BOOL) value;
-
-// click counting makes it possible to recognize if the user has pressed a button repeatedly
-// click counting does delay each event as it has to wait if there is another event (second click)
-// therefore there is a slight time difference (maximumClickCountTimeDifference) between a single click
-// of the user and the call of your delegate method
-// click counting can be enabled individually for specific buttons. Use the property clickCountEnableButtons to
-// set the buttons for which click counting shall be enabled
-- (BOOL) clickCountingEnabled;
-- (void) setClickCountingEnabled: (BOOL) value;
-
-- (unsigned int) clickCountEnabledButtons;
-- (void) setClickCountEnabledButtons: (unsigned int)value;
-
-// the maximum time difference till which clicks are recognized as multi clicks
-- (NSTimeInterval) maximumClickCountTimeDifference;
-- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff;
-
- at end
-
-/*
- * Method definitions for the delegate of the MultiClickRemoteBehavior class
- */
- at interface NSObject(MultiClickRemoteBehaviorDelegate)
-
-- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int) count;
-
- at end
diff --git a/apple_remote/inc/RemoteControl.h b/apple_remote/inc/RemoteControl.h
deleted file mode 100644
index 4476af2..0000000
--- a/apple_remote/inc/RemoteControl.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************
- * RemoteControl.h
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#ifndef DID_DEFINE_SOME_FUTURE_TYPES
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
- at class CALayer;
- at class NSViewController;
-typedef int NSColorRenderingIntent;
-#define DID_DEFINE_SOME_FUTURE_TYPES
-#endif
-#endif
-
-#import <Cocoa/Cocoa.h>
-
-// notifaction names that are being used to signal that an application wants to
-// have access to the remote control device or if the application has finished
-// using the remote control device
-extern NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION;
-extern NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION;
-
-// keys used in user objects for distributed notifications
-extern NSString* kRemoteControlDeviceName;
-extern NSString* kApplicationIdentifier;
-extern NSString* kTargetApplicationIdentifier;
-
-// we have a 6 bit offset to make a hold event out of a normal event
-#define EVENT_TO_HOLD_EVENT_OFFSET 6
-
- at class RemoteControl;
-
-typedef enum _RemoteControlEventIdentifier {
-    // normal events
-    kRemoteButtonPlus               =1<<1,
-    kRemoteButtonMinus              =1<<2,
-    kRemoteButtonMenu               =1<<3,
-    kRemoteButtonPlay               =1<<4,
-    kRemoteButtonRight              =1<<5,
-    kRemoteButtonLeft               =1<<6,
-
-    // hold events
-    kRemoteButtonPlus_Hold          =1<<7,
-    kRemoteButtonMinus_Hold         =1<<8,
-    kRemoteButtonMenu_Hold          =1<<9,
-    kRemoteButtonPlay_Hold          =1<<10,
-    kRemoteButtonRight_Hold         =1<<11,
-    kRemoteButtonLeft_Hold          =1<<12,
-
-    // special events (not supported by all devices)
-    kRemoteControl_Switched         =1<<13,
-
-    // New values for the "metallic" Remote (2009 model)
-    kMetallicRemote2009ButtonPlay       =1<<14,
-    kMetallicRemote2009ButtonMiddlePlay =1<<15
-
-} RemoteControlEventIdentifier;
-
- at interface NSObject(RemoteControlDelegate)
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl;
-
- at end
-
-/*
-    Base Interface for Remote Control devices
-*/
- at interface RemoteControl : NSObject {
-    id delegate;
-}
-
-// returns nil if the remote control device is not available
-- (id) initWithDelegate: (id) remoteControlDelegate;
-
-- (void) setListeningToRemote: (BOOL) value;
-- (BOOL) isListeningToRemote;
-
-- (BOOL) isOpenInExclusiveMode;
-- (void) setOpenInExclusiveMode: (BOOL) value;
-
-- (void) startListening: (id) sender;
-- (void) stopListening: (id) sender;
-
-// is this remote control sending the given event?
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier;
-
-// sending of notifications between applications
-+ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier;
-+ (void) sendRequestForRemoteControlNotification;
-
-// name of the device
-+ (const char*) remoteControlDeviceName;
-
- at end
diff --git a/apple_remote/inc/RemoteControlContainer.h b/apple_remote/inc/RemoteControlContainer.h
deleted file mode 100644
index e82fa6b..0000000
--- a/apple_remote/inc/RemoteControlContainer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * RemoteControlContainer.h
- * RemoteControlWrapper
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#import "RemoteControl.h"
-
- at interface RemoteControlContainer : RemoteControl {
-    NSMutableArray* remoteControls;
-}
-
-- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz;
-- (unsigned int) count;
-
- at end
diff --git a/apple_remote/inc/RemoteMainController.h b/apple_remote/inc/RemoteMainController.h
deleted file mode 100644
index 1674540..0000000
--- a/apple_remote/inc/RemoteMainController.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * RemoteMainController.h
- *
- *
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
- * Copyright (c) 2006 martinkahr.com. All rights reserved.
- *
- * Code modified and adapted to OpenOffice.org
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *****************************************************************************/
-
-#ifndef DID_DEFINE_SOME_FUTURE_TYPES
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
- at class CALayer;
- at class NSViewController;
-typedef int NSColorRenderingIntent;
-#define DID_DEFINE_SOME_FUTURE_TYPES
-#endif
-#endif
-
-#import <Cocoa/Cocoa.h>
-
-#define AppleRemoteControlEvent 15
-
- at class RemoteControl;
- at class MultiClickRemoteBehavior;
-
-//static void sendTheEvent( unichar, int );
-
- at interface MainController : NSObject {
- at public // else remoteControl is not reachable from GetSalData()->mpMainController
-    RemoteControl* remoteControl;
- at private
-    MultiClickRemoteBehavior* remoteControlBehavior;
-}
-- (RemoteControl*) remoteControl;
-- (MultiClickRemoteBehavior*) remoteBehavior;
-
- at end
diff --git a/apple_remote/inc/apple_remote/RemoteControl.h b/apple_remote/inc/apple_remote/RemoteControl.h
new file mode 100644
index 0000000..4476af2
--- /dev/null
+++ b/apple_remote/inc/apple_remote/RemoteControl.h
@@ -0,0 +1,120 @@
+/*****************************************************************************
+ * RemoteControl.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list