mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Android: fix for pausing openGL apps. Rebuild of project files.

Browse source
This commit is contained in:
jules 2013-02-24 16:12:36 +00:00
parent 942b2922a5
commit 9e4baf538b
19 changed files with 136 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
View file

@ -36,11 +36,11 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

51
extras/JuceDemo/Builds/Android/src/com/juce/JuceDemo.java
View file

@ -81,6 +81,9 @@ public final class JuceDemo extends Activity
@Override
protected final void onPause()
{
if (viewHolder != null)
viewHolder.onPause();
suspendApp();
super.onPause();
}
@ -89,6 +92,10 @@ public final class JuceDemo extends Activity
protected final void onResume()
{
super.onResume();
if (viewHolder != null)
viewHolder.onResume();
resumeApp();
}
@ -167,6 +174,28 @@ public final class JuceDemo extends Activity
}
}
public final void onPause()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof ComponentPeerView)
((ComponentPeerView) v).onPause();
}
}
public final void onResume()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof ComponentPeerView)
((ComponentPeerView) v).onResume();
}
}
private boolean isFirstResize = true;
}
@ -437,6 +466,28 @@ public final class JuceDemo extends Activity
return true; //xxx needs to check overlapping views
}
public final void onPause()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof OpenGLView)
((OpenGLView) v).onPause();
}
}
public final void onResume()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof OpenGLView)
((OpenGLView) v).onResume();
}
}
public OpenGLView createGLView()
{
OpenGLView glView = new OpenGLView (getContext());

4
extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj
View file

@ -36,11 +36,11 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

4
extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/static library/Builds/VisualStudio2008/juce.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -54,7 +54,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/static library/Builds/VisualStudio2010/juce.vcxproj
View file

@ -36,11 +36,11 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">jucedebug</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">juce</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

4
extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj
View file

@ -12,7 +12,7 @@
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -68,7 +68,7 @@
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

4
extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj
View file

@ -36,11 +36,11 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Jucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Jucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

51
modules/juce_core/native/java/JuceAppActivity.java
View file

@ -81,6 +81,9 @@ public final class JuceAppActivity extends Activity
@Override
protected final void onPause()
{
if (viewHolder != null)
viewHolder.onPause();
suspendApp();
super.onPause();
}
@ -89,6 +92,10 @@ public final class JuceAppActivity extends Activity
protected final void onResume()
{
super.onResume();
if (viewHolder != null)
viewHolder.onResume();
resumeApp();
}
@ -167,6 +174,28 @@ public final class JuceAppActivity extends Activity
}
}
public final void onPause()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof ComponentPeerView)
((ComponentPeerView) v).onPause();
}
}
public final void onResume()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof ComponentPeerView)
((ComponentPeerView) v).onResume();
}
}
private boolean isFirstResize = true;
}
@ -437,6 +466,28 @@ public final class JuceAppActivity extends Activity
return true; //xxx needs to check overlapping views
}
public final void onPause()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof OpenGLView)
((OpenGLView) v).onPause();
}
}
public final void onResume()
{
for (int i = getChildCount(); --i >= 0;)
{
View v = getChildAt (i);
if (v instanceof OpenGLView)
((OpenGLView) v).onResume();
}
}
public OpenGLView createGLView()
{
OpenGLView glView = new OpenGLView (getContext());