Skip to content

Commit 3513f03

Browse files
Merge remote-tracking branch 'origin/develop-6.7' into develop-7.0
Refactoring needed for: * new platform player property 'mirrored' * new iOS player property 'readyForDisplay' Conflicts: engine/Makefile.common engine/Makefile.development engine/Makefile.installer engine/Makefile.kernel engine/Makefile.kernel-common engine/Makefile.kernel-development engine/Makefile.kernel-server engine/Makefile.server engine/Makefile.standalone engine/src/dskspec.cpp engine/src/mac-av-player.mm engine/src/mblcontrol.cpp engine/src/player-platform.h engine/src/srvwindows.cpp engine/src/variable.h revdb/Android.mk revdb/Makefile.server-dbmysql thirdparty
2 parents 3a3b3ae + 13fb0a5 commit 3513f03

67 files changed

Lines changed: 475 additions & 1418 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/dictionary/command/answer-effect.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
<example>if the altKey is down then answer effect</example>
4343
</examples>
4444
<description>
45-
<p>Use the <b>answer effect</b> <glossary tag="command">command</glossary> to choose a visual effect, or to set up an effect with complex options for later use.</p><p/><p><b>Comments:</b></p><p>The <b>answer effect</b> <glossary tag="command">command</glossary> displays a <glossary tag="dialog box">dialog box</glossary> where the user can select a visual effect and (for some effects) set parameters such as speed and direction. (This <glossary tag="dialog box">dialog box</glossary> is displayed by <glossary tag="QuickTime">QuickTime</glossary>, not by LiveCode.)</p><p/><p>An encoded description of the visual effect the user chooses is placed in the <b>it</b> <glossary tag="variable">variable</glossary>. You can either use the encoded description immediately, or store it (for example, in a <glossary tag="variable">variable</glossary> or in a <property tag="customProperties">custom property</property>) for later use. To display the effect, use the encoded description with the <command tag="visual effect">visual effect</command> <glossary tag="command">command</glossary>, with the <command tag="unlock screen">unlock screen</command> <glossary tag="command">command</glossary>, or with the<code> hide with visual effect </code>or<code> show with visual effect </code>form of the <b>hide</b> or <command tag="show">show</command> <glossary tag="command">command</glossary>.</p><p/><p>If the user cancels the dialog, the <b>it</b> <glossary tag="variable">variable</glossary> is set to empty, and the <function tag="result">result</function> <control_st tag="function">function</control_st> <glossary tag="return">returns</glossary> "Cancel".</p>
45+
<p>Use the <b>answer effect</b> <glossary tag="command">command</glossary> to choose a visual effect, or to set up an effect with complex options for later use.</p><p/><p><b>Comments:</b></p><p>The <b>answer effect</b> <glossary tag="command">command</glossary> displays a <glossary tag="dialog box">dialog box</glossary> where the user can select a visual effect and (for some effects) set parameters such as speed and direction. (This <glossary tag="dialog box">dialog box</glossary> is displayed by <glossary tag="QuickTime">QuickTime</glossary>, not by LiveCode. Thus make sure the <b>dontUseQT</b> property is set to false, to allow LiveCode work with QuickTime)</p><p/><p>An encoded description of the visual effect the user chooses is placed in the <b>it</b> <glossary tag="variable">variable</glossary>. You can either use the encoded description immediately, or store it (for example, in a <glossary tag="variable">variable</glossary> or in a <property tag="customProperties">custom property</property>) for later use. To display the effect, use the encoded description with the <command tag="visual effect">visual effect</command> <glossary tag="command">command</glossary>, with the <command tag="unlock screen">unlock screen</command> <glossary tag="command">command</glossary>, or with the<code> hide with visual effect </code>or<code> show with visual effect </code>form of the <b>hide</b> or <command tag="show">show</command> <glossary tag="command">command</glossary>.</p><p/><p>If the user cancels the dialog, the <b>it</b> <glossary tag="variable">variable</glossary> is set to empty, and the <function tag="result">result</function> <control_st tag="function">function</control_st> <glossary tag="return">returns</glossary> "Cancel".</p>
4646
</description>
4747
</doc>

docs/dictionary/function/QTEffects.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
</parameters>
5959

6060
<value>The <b>qtEffects</b> <glossary tag="function">function</glossary> <glossary tag="return">returns</glossary> a list of installed effect names, one per line.</value>
61-
<comments>The effects returned by the <b>qtEffects</b> <glossary tag="function">function</glossary> can be used as visual effects with the <command tag="visual effect">visual effect</command>, <command tag="unlock screen">unlock screen</command>, <command tag="show">show</command> and <command tag="hide">hide</command> commands.</comments>
61+
<comments>The effects returned by the <b>qtEffects</b> <glossary tag="function">function</glossary> can be used as visual effects with the <command tag="visual effect">visual effect</command>, <command tag="unlock screen">unlock screen</command>, <command tag="show">show</command> and <command tag="hide">hide</command> commands. When using this function, make sure the <b>dontUseQT</b> property is set to false, to allow LiveCode work with QuickTime</comments>
6262
</description>
6363
</doc>

docs/dictionary/function/QTVersion.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@
6868
</parameters>
6969

7070
<value>The <b>qtVersion</b> function returns a positive number.</value>
71-
<comments>On Unix systems, the <b>qtVersion</b> function always <glossary tag="return">returns</glossary> 2.0.<p></p><p>On Mac OS and Windows systems, if <glossary tag="QuickTime">QuickTime</glossary> is not installed, the <b>qtVersion</b> function <glossary tag="return">returns</glossary> 0.0. Otherwise, it returns the <glossary tag="QuickTime">QuickTime</glossary> version number.</p><p></p><p></p><tip>It can take LiveCode a second or two to load the code needed to use <glossary tag="QuickTime">QuickTime</glossary>, depending on the machine speed. Since this code is only <glossary tag="loaded into memory">loaded into memory</glossary> once per session, you can speed up the first occurrence of a QuickTime-related action by calling the <function tag="qtVersion">qtVersion</function> function during otherwise dead time--for example, during startup of your application--to preload the code.</tip></comments>
71+
<comments>On Unix systems, the <b>qtVersion</b> function always <glossary tag="return">returns</glossary> 2.0.<p></p><p>On Mac OS and Windows systems, if <glossary tag="QuickTime">QuickTime</glossary> is not installed, the <b>qtVersion</b> function <glossary tag="return">returns</glossary> 0.0. Otherwise, it returns the <glossary tag="QuickTime">QuickTime</glossary> version number. In this case, make sure the <b>dontUseQT</b> property is set to false, to allow LiveCode work with QuickTime.</p><p></p><p></p><tip>It can take LiveCode a second or two to load the code needed to use <glossary tag="QuickTime">QuickTime</glossary>, depending on the machine speed. Since this code is only <glossary tag="loaded into memory">loaded into memory</glossary> once per session, you can speed up the first occurrence of a QuickTime-related action by calling the <function tag="qtVersion">qtVersion</function> function during otherwise dead time--for example, during startup of your application--to preload the code.</tip></comments>
7272
</description>
7373
</doc>

docs/dictionary/function/mobileControlGet.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/dictionary/property/dontUseQT.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</references>
2222
<history>
2323
<introduced version="1.0">Added.</introduced>
24+
<changed version="6.7.6">1.1</changed>
2425
</history>
2526
<platforms>
2627
<mac/>
@@ -38,9 +39,10 @@
3839
<example>set the dontUseQT to true</example>
3940
<example>if the platform is "Win32" then set the dontUseQT to true</example>
4041
<example>if the platform is "Win32" then set the dontUseQT of player "winPlayer" to true</example>
42+
<example>if the platform is "MacOS" then set the dontUseQT of player "osxPlayer" to false</example>
4143
</examples>
4244
<description>
43-
<p>Use the <b>dontUseQT</b> <glossary tag="property">property</glossary> to test operation of a <object tag="stack">stack</object> using the built-in MCI video on <glossary tag="Windows">Windows systems</glossary>, or to use built-in visual effects rather than <glossary tag="QuickTime">QuickTime</glossary> effects.</p><p/><p><b>Value:</b></p><p>The <b>dontUseQT</b> is true or false.</p><p/><p>By default, the <b>dontUseQT</b> <glossary tag="property">property</glossary> is set to false.</p><p/><p><b>Comments:</b></p><p>If you have already used QuickTime during the current session, setting the <b>dontUseQT</b> <glossary tag="property">property</glossary> to true has no effect, because the code for LiveCode to use <glossary tag="QuickTime">QuickTime</glossary> is already <glossary tag="loaded into memory">loaded into memory</glossary> and will continue to be used until you quit the application.</p><p/><p>The following actions cause QuickTime to be loaded into memory:</p><p> * Displaying a player object</p><p> * Playing an audio clip or video clip</p><p> * Recording sound using the <b>record sound</b> command</p><p> * Using the <b>recordFormats</b> <control_st tag="function">function</control_st> or the <command tag="answer record">answer record</command> command</p><p> * Using a visual effect with <b>visual effect</b>, <command tag="show">show</command>, <command tag="hide">hide</command>, or unlock screen</p><p> * Using the answer effect <glossary tag="command">command</glossary> or <function tag="QTEffects">QTEffects</function> function</p><p> * Using the <b>QTVersion</b> function</p><p/><p><img src="202651"/> <b>Tip:</b> It may take LiveCode a second or two to load the code needed to use QuickTime, depending on the machine speed. Since this code is only loaded into memory once per session, you can speed up the first occurrence of an action listed above by calling the QTVersion func during otherwise dead time--for example, during startup of your application--to preload QuickTime.</p><p/><p>The setting of this property has no effect on Unix systems.</p><p/><p>On OSX systems, the default value of this property is true if the OSX version is greater or equal to 10.8, and false otherwise. If the <b>dontUseQT</b> is true on a <glossary tag="Mac OS">Mac OS system</glossary>,it plays movies and sounds using the AVFoundation framework.</p><p/><p>On Windows, if this property is true then the setting of a player's <property tag="alwaysBuffer">alwaysBuffer property</property> will have no effect. Moreover, on Windows you can set the <b>dontUseQT</b> property for a player object. Just make sure you do so before setting the filename property of the player
45+
<p>Use the <b>dontUseQT</b> <glossary tag="property">property</glossary> to test operation of a <object tag="stack">stack</object> using the built-in MCI video on <glossary tag="Windows">Windows systems</glossary>, or to use built-in visual effects rather than <glossary tag="QuickTime">QuickTime</glossary> effects.</p><p/><p><b>Value:</b></p><p>The <b>dontUseQT</b> is true or false.</p><p/><p>By default, the <b>dontUseQT</b> <glossary tag="property">property</glossary> is set to false.</p><p/><p><b>Comments:</b></p><p>If you have already used QuickTime during the current session, setting the <b>dontUseQT</b> <glossary tag="property">property</glossary> to true has no effect, because the code for LiveCode to use <glossary tag="QuickTime">QuickTime</glossary> is already <glossary tag="loaded into memory">loaded into memory</glossary> and will continue to be used until you quit the application.</p><p/><p>The following actions cause QuickTime to be loaded into memory:</p><p> * Displaying a player object</p><p> * Playing an audio clip or video clip</p><p> * Recording sound using the <b>record sound</b> command</p><p> * Using the <b>recordFormats</b> <control_st tag="function">function</control_st> or the <command tag="answer record">answer record</command> command</p><p> * Using a visual effect with <b>visual effect</b>, <command tag="show">show</command>, <command tag="hide">hide</command>, or unlock screen</p><p> * Using the answer effect <glossary tag="command">command</glossary> or <function tag="QTEffects">QTEffects</function> function</p><p> * Using the <b>QTVersion</b> function</p><p/><p><img src="202651"/> <b>Tip:</b> It may take LiveCode a second or two to load the code needed to use QuickTime, depending on the machine speed. Since this code is only loaded into memory once per session, you can speed up the first occurrence of an action listed above by calling the QTVersion func during otherwise dead time--for example, during startup of your application--to preload QuickTime.</p><p/><p>The setting of this property has no effect on Unix systems.</p><p/><p>On OSX systems, the default value of this property is true if the OSX version is greater or equal to 10.8, and false otherwise. If the <b>dontUseQT</b> is true on a <glossary tag="Mac OS">Mac OS system</glossary>,it plays movies and sounds using the AVFoundation framework.</p><p/><p>On Windows, if this property is true then the setting of a player's <property tag="alwaysBuffer">alwaysBuffer property</property> will have no effect. Moreover, you can set the <b>dontUseQT</b> property for a player object. Just make sure you do so before setting the filename property of the player. The default value of this property of a player object is false on Windows, and true on OSX.
4446
</p>
4547
</description>
4648
</doc>

docs/dictionary/property/mirrored.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<doc> <legacy_id></legacy_id> <name>mirrored</name> <type>property</type> <syntax> <example>set the mirrored of <i>player</i> to {true | false}</example> </syntax> <synonyms> </synonyms> <summary>Specifies whether a <keyword tag="player">player</keyword> displays the video frames in "mirrored" mode.</summary> <examples><example>set the mirrored of player "myPlayer" to true</example> </examples> <history> <introduced version="6.7">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> <player/> </objects> <platforms> <mac/> </platforms> <classes> <desktop/> </classes> <security> </security> <classification> <category>Images &amp; Multimedia</category> </classification> <references> <property tag="startTime">startTime Property</property> <property tag="showSelection">showSelection Property</property> </references> <description>Use the <b>mirrored</b> <glossary tag="property">property</glossary> to flip horizontally the frames of a player.<p></p><p><b>Value:</b></p><p>The <b>mirrored</b> of a <keyword tag="player">player</keyword> is true or false.</p><p></p><p>By default, the <b>mirrored</b> <glossary tag="property">property</glossary> of a newly created <keyword tag="player">player</keyword> is set to false.</p></description></doc>

docs/notes/bugfix-13754.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Changing the scalefactor might hide the stack off screen

docs/notes/bugfix-13820.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Player object cannot play a midi file on Yosemite.

docs/notes/bugfix-14423.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# revCapture - revCaptureListVideoCodecs() results in crash
2+
3+
To palliate this problem, some getters in the library revCapture must return possibly UTF-8 encoded names (such as the codecs) to allow the script writer to set them.
4+
In the same idea, some setters can be given UTF-8 encoded strings.
5+
6+
Affected getters:
7+
- revCaptureListAudioInputs
8+
- revCaptureListVideoInputs
9+
- revCaptureGetAudioInput
10+
- revCaptureGetVideoInput
11+
- revCaptureGetPreviewImage
12+
- revCaptureListAudioCodecs
13+
- revCaptureListVideoCodecs
14+
- revCaptureGetAudioCodec
15+
- revCaptureGetVideoCodec
16+
- revCaptureGetRecordOutput
17+
18+
Affected setters:
19+
- revCaptureSetAudioInput
20+
- revCaptureSetVideoInput
21+
- revCaptureSetPreviewImage
22+
- revCaptureSetAudioCodec
23+
- revCaptureSetVideoCodec
24+
- revCaptureSetRecordOutput

docs/notes/bugfix-14447.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[Docs]] QTVersion of QuickTime return 0.0

0 commit comments

Comments
 (0)