livecode · livecodeali · Jul 24, 2018 · May 18, 2018 · May 18, 2018 · Jun 4, 2018
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -1,7 +1,7 @@
 script "BuilderUtilities"
 
-constant kMergExtVersion = "2018-6-4"
-constant kTSNetVersion = "1.3.6"
+constant kMergExtVersion = "2018-6-22"
+constant kTSNetVersion = "1.3.7"
 
 local sEngineDir
 local sWorkDir

diff --git a/config.py b/config.py
@@ -25,7 +25,7 @@
 BUILDBOT_PLATFORM_TRIPLES = (
     'x86-linux-debian8',
     'x86_64-linux-debian8',
-    'armv6-android-api26',
+    'armv6-android-sdk26_ndk16r15',
     'universal-mac-macosx10.9', # Minimum deployment target
     'universal-ios-iphoneos11.4',
     'universal-ios-iphoneos11.2',
@@ -119,7 +119,8 @@ def exec_gyp(args):
 def process_env_options(opts):
     vars = ('OS', 'PLATFORM', 'GENERATOR_OUTPUT', 'FORMATS', 'DEPTH',
         'WIN_MSVS_VERSION', 'XCODE_TARGET_SDK', 'XCODE_HOST_SDK',
-        'TARGET_ARCH', 'PERL', 'ANDROID_NDK_VERSION', 'ANDROID_PLATFORM',
+        'TARGET_ARCH', 'PERL', 'ANDROID_NDK_VERSION',
+        'ANDROID_NDK_PLATFORM_VERSION', 'ANDROID_PLATFORM',
         'ANDROID_SDK', 'ANDROID_NDK', 'ANDROID_BUILD_TOOLS',
         'ANDROID_TOOLCHAIN', 'ANDROID_API_VERSION',
         'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY', 'OBJDUMP',
@@ -422,6 +423,9 @@ def validate_android_tools(opts):
             error('Android NDK not found; set $ANDROID_NDK')
         opts['ANDROID_NDK'] = ndk
 
+    if opts['ANDROID_NDK_PLATFORM_VERSION'] is None:
+        opts['ANDROID_NDK_PLATFORM_VERSION'] = '16'
+
     if opts['ANDROID_API_VERSION'] is None:
         opts['ANDROID_API_VERSION'] = '26'
 
@@ -538,6 +542,7 @@ def configure_android(opts):
 
     export_opts(opts, ('ANDROID_BUILD_TOOLS', 'ANDROID_NDK',
                        'ANDROID_PLATFORM', 'ANDROID_SDK',
+                       'ANDROID_NDK_VERSION', 'ANDROID_NDK_PLATFORM_VERSION',
                        'ANDROID_API_VERSION',
                        'JAVA_SDK', 'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY',
                        'OBJDUMP', 'STRIP'))

diff --git a/config/android.gypi b/config/android.gypi
@@ -8,7 +8,9 @@
 			'java_sdk_path%': '<!(echo ${JAVA_SDK})',
 			'android_sdk_path%': '<!(echo ${ANDROID_SDK})',
 			'android_ndk_path%': '<!(echo ${ANDROID_NDK})',
-			'android_api_version%': '<!(echo ${ANDROID_API_VERSION})',			
+			'android_api_version%': '<!(echo ${ANDROID_API_VERSION})',
+			'android_ndk_platform_version%': '<!(echo ${ANDROID_NDK_PLATFORM_VERSION})',
+			'android_ndk_version%': '<!(echo ${ANDROID_NDK_VERSION})',
 			'android_platform%': '<!(echo ${ANDROID_PLATFORM})',
 			'android_build_tools%': '<!(echo ${ANDROID_BUILD_TOOLS})',
 		},
@@ -30,7 +32,7 @@
 		'strip':   '<!(echo ${STRIP:-strip})',
 
 		'android_ndk_path%': '<(android_ndk_path)',
-		'android_api_version%': '<(android_api_version)',
+		'android_subplatform%': 'sdk<(android_api_version)_ndk<(android_ndk_platform_version)<(android_ndk_version)',
 	},
 
 	'target_defaults':

diff --git a/docs/development/build-android.md b/docs/development/build-android.md
@@ -41,15 +41,10 @@ Update the SDK:
 Create a standalone toolchain (this simplifies setting up the build environment):
 
 ````bash
-<<<<<<< HEAD
-android-ndk-r14/build/tools/make_standalone_toolchain.py \
-    --arch arm --api 19 \
-=======
 android-ndk-r15/build/tools/make_standalone_toolchain.py \
-    --arch arm --api 26 \
->>>>>>> upstream/develop-9.0
+    --arch arm --api 16 --deprecated-headers \
     --install-dir ${HOME}/android/toolchain/standalone
-````
+```
 
 Add a couple of symlinks to allow the engine configuration script to find the Android toolchain:
 
@@ -86,6 +81,7 @@ AR="${BINDIR}/${TRIPLE}-ar"
 
 # Android platform information
 ANDROID_NDK_VERSION=r15
+ANDROID_NDK_PLATFORM_VERSION=16
 ANDROID_API_VERSION=26
 ANDROID_PLATFORM=android-${ANDROID_API_VERSION}
 ANDROID_NDK=${TOOLCHAIN}/android-ndk-${ANDROID_NDK_VERSION}
@@ -95,7 +91,8 @@ ANDROID_LIB_PATH=${TOOLCHAIN}/standalone/${TRIPLE}/lib
 
 export JAVA_SDK
 export CC CXX LINK AR
-export ANDROID_PLATFORM ANDROID_NDK ANDROID_SDK ANDROID_BUILD_TOOLS
+export ANDROID_PLATFORM ANDROID_NDK ANDROID_NDK_PLATFORM_VERSION
+export ANDROID_SDK ANDROID_BUILD_TOOLS
 export ANDROID_LIB_PATH ANDROID_API_VERSION
 ````
 

diff --git a/docs/dictionary/property/audioPan.lcdoc b/docs/dictionary/property/audioPan.lcdoc
@@ -0,0 +1,43 @@
+Name: audioPan
+
+Type: property
+
+Syntax: set the audioPan of <player> to <positive/negative percentage>
+
+Summary:
+Specifies the proportion of audio panned from one stereo channel to the other.
+
+Introduced: 9.0.1
+
+OS: mac
+
+Platforms: desktop
+
+Example:
+set the audioPan of player "myVideoPlayer" to 0 -- stereo channels unaffected
+
+Example:
+set the audioPan of player "myVideoPlayer" to -50 -- 50% of the right channel audio moved to the left.
+
+Example:
+set the audioPan of player "myVideoPlayer" to 100 -- 100% of the left channel audio moved to the right.
+
+Value:
+The audioPan is a number between -100 and 100.
+By default, the audioPan property is 0.
+
+Description:
+Use the audioPan property to pan audio from either the left or right channel to the other.
+Negative values move audio from the right channel to the left.
+Positive values move audio from the left channel to the right.
+Setting the audioPan back to 0 will disable panning.
+
+>**Important:** This property only has an effect on media files that contain stereo audio tracks.
+> Mono audio tracks cannot currently be panned.
+
+References: player (object), leftBalance (property), rightBalance (property)
+
+Associations: player
+
+Tags: multimedia
+
diff --git a/docs/dictionary/property/leftBalance.lcdoc b/docs/dictionary/property/leftBalance.lcdoc
@@ -0,0 +1,36 @@
+Name: leftBalance
+
+Type: property
+
+Syntax: set the leftBalance of <player> to <percentage>
+
+Summary:
+Specifies the volume of the left stereo channel output of a player control.
+
+Introduced: 9.0.1
+
+OS: mac
+
+Platforms: desktop
+
+Example:
+set the leftBalance of player "myVideoPlayer" to 100 -- maximum loudness
+
+Value:
+The leftBalance is a number between zero and 100.
+By default, the leftBalance property is 100.
+
+Description:
+Use the leftBalance property to set the volume of audio played through the left speaker.
+
+Setting the leftBalance to zero turns off audio to the left speaker.
+
+>**Important:** This property only has an effect on media files that contain stereo audio tracks.
+> Mono audio tracks cannot currently be balanced.
+
+References: player (object), rightBalance (property), audioPan (property)
+
+Associations: player
+
+Tags: multimedia
+
diff --git a/docs/dictionary/property/playLoudness.lcdoc b/docs/dictionary/property/playLoudness.lcdoc
@@ -38,7 +38,8 @@ on the left side of the <player|player's> controller bar, which is
 visible if the <player|player's> <showController> property is true.
 
 References: play (command), beep (command), recordLoudness (function),
-player (object), showController (property)
+player (object), showController (property),
+leftBalance (property), rightBalance (property), audioPan (property)
 
 Tags: multimedia
 
diff --git a/docs/dictionary/property/rightBalance.lcdoc b/docs/dictionary/property/rightBalance.lcdoc
@@ -0,0 +1,36 @@
+Name: rightBalance
+
+Type: property
+
+Syntax: set the rightBalance of <player> to <percentage>
+
+Summary:
+Specifies the volume of the right stereo channel output of a player control.
+
+Introduced: 9.0.1
+
+OS: mac
+
+Platforms: desktop
+
+Example:
+set the rightBalance of player "myVideoPlayer" to 100 -- maximum loudness
+
+Value:
+The rightBalance is a number between zero and 100.
+By default, the rightBalance property is 100.
+
+Description:
+Use the rightBalance property to set the volume of audio played through the right speaker.
+
+Setting the rightBalance to zero turns off audio to the right speaker.
+
+>**Important:** This property only has an effect on media files that contain stereo audio tracks.
+> Mono audio tracks cannot currently be balanced.
+
+References: player (object), rightBalance (property), audioPan (property)
+
+Associations: player
+
+Tags: multimedia
+
diff --git a/docs/notes/bugfix-16366.md b/docs/notes/bugfix-16366.md
@@ -0,0 +1 @@
+# Ensure the area outside the stack rect is re-rendered when going to a new card in fullscreen mode showAll
diff --git a/docs/notes/bugfix-16736.md b/docs/notes/bugfix-16736.md
@@ -0,0 +1 @@
+# Fix crash when relayering objects with accelerated rendering true
diff --git a/docs/notes/bugfix-20211.md b/docs/notes/bugfix-20211.md
@@ -0,0 +1 @@
+# Fix Mac player crash when setting filename multiple times
diff --git a/docs/notes/bugfix-20839-2.md b/docs/notes/bugfix-20839-2.md
@@ -0,0 +1 @@
+# Improve appearance of disabled buttons when using Motif look-and-feel
diff --git a/docs/notes/bugfix-21171.md b/docs/notes/bugfix-21171.md
@@ -0,0 +1 @@
+# Ensure unicode characters in app label are shown correctly on Android
diff --git a/docs/notes/bugfix-21279.md b/docs/notes/bugfix-21279.md
@@ -0,0 +1 @@
+# Ensure objects are clipped correctly when rendering fullscreen mode leterbox with acceleratedRendering true
diff --git a/docs/notes/bugfix-21304.md b/docs/notes/bugfix-21304.md
@@ -0,0 +1 @@
+# Clear unshared data when compacting stack
diff --git a/docs/notes/bugfix-21336.md b/docs/notes/bugfix-21336.md
@@ -0,0 +1 @@
+# Ensure only the top stack will render on mobile
diff --git a/docs/notes/bugfix-21356.md b/docs/notes/bugfix-21356.md
@@ -0,0 +1 @@
+# Fix black screen on Android when setting acceleratedRendering at startup
diff --git a/docs/notes/bugfix-21368.md b/docs/notes/bugfix-21368.md
@@ -0,0 +1 @@
+# Ensure push notifications work on Android when targetSdkVersion=26
diff --git a/docs/notes/bugfix-21386.md b/docs/notes/bugfix-21386.md
@@ -0,0 +1 @@
+# Fix widgets with native layers not being clipped by their parent group rect on iOS
diff --git a/docs/notes/bugfix-21395.md b/docs/notes/bugfix-21395.md
@@ -0,0 +1 @@
+# Fix MacOSX player control not starting when playRate property is 0
diff --git a/docs/notes/bugfix-21398.md b/docs/notes/bugfix-21398.md
@@ -0,0 +1 @@
+# Do not split up .framework folders between MacOS and Resources/_MacOS folder
diff --git a/docs/notes/feature-player-pan-mac.md b/docs/notes/feature-player-pan-mac.md
@@ -0,0 +1,8 @@
+# New stereo panning properties added to MacOSX Player object
+
+leftBalance: control the volume of the left stereo channel.
+rightBalance: control the volume of the right stereo channel.
+audioPan: pan audio from one stereo channel to another.
+
+Note: these properties currently require media files to have stereo audio tracks.
+There will be no effect on mono or surround-sound formats.
diff --git a/engine/kernel.gyp b/engine/kernel.gyp
@@ -148,9 +148,11 @@
 							'libraries':
 							[
 								'$(SDKROOT)/usr/lib/libcups.dylib',
+								'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
 								'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
 								'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
 								'$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+								'$(SDKROOT)/System/Library/Frameworks/MediaToolbox.framework',
 								'$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
 							],
 						},
@@ -174,8 +176,10 @@
                         {
                             'libraries!':
                             [
+								'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
                                 '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
                                 '$(SDKROOT)/System/Library/Frameworks/CoreMedia.framework',
+								'$(SDKROOT)/System/Library/Frameworks/MediaToolbox.framework',
                             ],
                         },
                     ],

diff --git a/engine/rsrc/android-manifest.xml b/engine/rsrc/android-manifest.xml
@@ -6,7 +6,7 @@
           ${INSTALL_LOCATION}>
 ${PUSH_PERMISSIONS}
 ${USES_PERMISSION}${USES_FEATURE}
-  <uses-sdk android:minSdkVersion="${MIN_SDK_VERSION}" android:targetSdkVersion="${MIN_SDK_VERSION}"/>
+  <uses-sdk android:minSdkVersion="${MIN_SDK_VERSION}" android:targetSdkVersion="26"/>
   <supports-screens
       android:largeScreens="true"
       android:normalScreens="true"

diff --git a/engine/src/buttondraw.cpp b/engine/src/buttondraw.cpp
@@ -109,6 +109,7 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 	bool t_isvista = MCmajorosversion >= 0x0600 && MCcurtheme != NULL;
 
 	bool t_themed_menu = false;
+	bool t_use_alpha_layer = false;
 
 	if (entry != NULL)
 	{
@@ -352,7 +353,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 			if (MClook == LF_MOTIF)
 			{
 				setforeground(dc, DI_FORE, False);
-				dc->setfillstyle(FillStippled, nil, 0, 0);
+				dc->setopacity(127);
+				dc->begin(false);
+				t_use_alpha_layer = true;
 			}
 			else if (IsMacLF())
 			{
@@ -576,6 +579,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 				MCStringRef t_name = MCNameGetString(getname());
                 drawdirectionaltext(dc, rect.x + leftmargin, starty, t_name, m_font);
 			}
+
+			if (t_use_alpha_layer)
+				dc->end();
 
 			// MW-2012-01-27: [[ Bug 9432 ]] Native GTK handles focus borders itself
 			//   so don't render the win95-style one.
@@ -1608,7 +1614,7 @@ void MCButton::drawtabs(MCDC *dc, MCRectangle &srect)
 			{
 			case LF_MOTIF:
 				setforeground(dc, DI_FORE, False);
-				dc->setfillstyle(FillStippled, nil, 0, 0);
+				dc->setopacity(127);
 				break;
 			case LF_MAC:
 				dc->setforeground(dc->getgray());

diff --git a/engine/src/em-dc.cpp b/engine/src/em-dc.cpp
@@ -190,7 +190,7 @@ MCScreenDC::openwindow(Window p_window,
 	MCEmscriptenSetWindowRect(t_window, t_stack->view_getrect());
 
 	t_stack->view_configure(true);
-	t_stack->view_dirty_all();
+	t_stack->dirtyall();
 }
 
 void

diff --git a/engine/src/exec-interface-player.cpp b/engine/src/exec-interface-player.cpp
@@ -594,6 +594,36 @@ void MCPlayer::SetPlayLoudness(MCExecContext& ctxt, uinteger_t p_loudness)
 	setloudness();
 }
 
+void MCPlayer::GetLeftBalance(MCExecContext &ctxt, double &r_left_balance)
+{
+	r_left_balance = getleftbalance();
+}
+
+void MCPlayer::SetLeftBalance(MCExecContext &ctxt, double p_left_balance)
+{
+	setleftbalance(MCMin(p_left_balance, 100.0));
+}
+
+void MCPlayer::GetRightBalance(MCExecContext &ctxt, double &r_right_balance)
+{
+	r_right_balance = getrightbalance();
+}
+
+void MCPlayer::SetRightBalance(MCExecContext &ctxt, double p_right_balance)
+{
+	setrightbalance(MCMin(p_right_balance, 100.0));
+}
+
+void MCPlayer::GetAudioPan(MCExecContext &ctxt, double &r_pan)
+{
+	r_pan = getaudiopan();
+}
+
+void MCPlayer::SetAudioPan(MCExecContext &ctxt, double p_pan)
+{
+	setaudiopan(MCClamp(p_pan, -100.0, 100.0));
+}
+
 void MCPlayer::GetTrackCount(MCExecContext& ctxt, uinteger_t& r_count)
 {
 	r_count = gettrackcount();

diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -856,6 +856,8 @@ void X_clear_globals(void)
 
     MChooks = nil;
 
+    memset(&MClicenseparameters, 0, sizeof(MCLicenseParameters));
+
 #if defined(MCSSL)
     MCSocketsInitialize();
 #endif
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Ensure the area outside the stack rect is re-rendered when going to a new card in fullscreen mode showAll
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Fix crash when relayering objects with accelerated rendering true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Fix Mac player crash when setting filename multiple times
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Improve appearance of disabled buttons when using Motif look-and-feel
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Ensure unicode characters in app label are shown correctly on Android
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Ensure objects are clipped correctly when rendering fullscreen mode leterbox with acceleratedRendering true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Ensure only the top stack will render on mobile
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Fix black screen on Android when setting acceleratedRendering at startup
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Ensure push notifications work on Android when targetSdkVersion=26
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Fix widgets with native layers not being clipped by their parent group rect on iOS