Skip to content

Commit

Permalink
Implemented square, saw, triangle waves
Browse files Browse the repository at this point in the history
Removed unneccessary modules from project
  • Loading branch information
olehxch committed Aug 17, 2016
1 parent 5025c6c commit 4825e00
Show file tree
Hide file tree
Showing 27 changed files with 2,999 additions and 1,094 deletions.
21 changes: 21 additions & 0 deletions Builds/Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="2.0.0"
package="com.yourcompany">
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.INTERNET"/>
<application android:label="@string/app_name" android:hardwareAccelerated="false">
<activity android:name="SimpleWavesGenerator" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="unspecified">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
33 changes: 33 additions & 0 deletions Builds/Android/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>

<project name="Simple Waves Generator" default="debug">
<loadproperties srcFile="local.properties"/>
<loadproperties srcFile="project.properties"/>
<target name="clean" depends="android_rules.clean">
<delete dir="libs"/>
<delete dir="obj"/>
<exec executable="${ndk.dir}/ndk-build" dir="${basedir}" failonerror="true">
<arg value="clean"/>
</exec>
</target>
<target name="-pre-build">
<condition property="makefileConfig" value="Debug" else="Release">
<equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
</condition>
<condition property="ndkDebugValue" value="NDK_DEBUG=1" else="NDK_DEBUG=0">
<equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
</condition>
<condition property="app_abis" value="armeabi armeabi-v7a x86" else="armeabi armeabi-v7a x86">
<equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
</condition>
<exec executable="${ndk.dir}/ndk-build" dir="${basedir}" failonerror="true">
<arg value="--jobs=4"/>
<arg value="CONFIG=${makefileConfig}"/>
<arg value="${ndkDebugValue}"/>
<arg value="APP_ABI=${app_abis}"/>
</exec>
<delete file="${out.final.file}"/>
<delete file="${out.packaged.file}"/>
</target>
<import file="${sdk.dir}/tools/ant/build.xml"/>
</project>
43 changes: 43 additions & 0 deletions Builds/Android/jni/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Automatically generated makefile, created by the Projucer
# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_ARM_MODE := arm
endif

LOCAL_MODULE := juce_jni
LOCAL_SRC_FILES := \
../../../Source/SpectralViewComponent.cpp\
../../../Source/WaveformViewComponent.cpp\
../../../Source/OscillatorWave.cpp\
../../../Source/MainComponent.cpp\
../../../Source/Main.cpp\
../../../JuceLibraryCode/juce_audio_basics.cpp\
../../../JuceLibraryCode/juce_audio_devices.cpp\
../../../JuceLibraryCode/juce_audio_formats.cpp\
../../../JuceLibraryCode/juce_audio_processors.cpp\
../../../JuceLibraryCode/juce_audio_utils.cpp\
../../../JuceLibraryCode/juce_core.cpp\
../../../JuceLibraryCode/juce_data_structures.cpp\
../../../JuceLibraryCode/juce_events.cpp\
../../../JuceLibraryCode/juce_graphics.cpp\
../../../JuceLibraryCode/juce_gui_basics.cpp\
../../../JuceLibraryCode/juce_gui_extra.cpp\

ifeq ($(NDK_DEBUG),1)
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "C:/JUCE/modules" -O0 -std=gnu++11 -DJUCE_ANDROID=1 -DJUCE_ANDROID_API_VERSION=23 -DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_SimpleWavesGenerator -DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/SimpleWavesGenerator\" -DDEBUG=1 -D_DEBUG=1 -DJUCER_ANDROID_7F0E4A25=1 -DJUCE_APP_VERSION=2.0.0 -DJUCE_APP_VERSION_HEX=0x20000
LOCAL_LDLIBS := -llog -lGLESv2 -landroid -lEGL
LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "C:/JUCE/modules" -O0 -std=gnu++11 -DJUCE_ANDROID=1 -DJUCE_ANDROID_API_VERSION=23 -DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_SimpleWavesGenerator -DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/SimpleWavesGenerator\" -DDEBUG=1 -D_DEBUG=1 -DJUCER_ANDROID_7F0E4A25=1 -DJUCE_APP_VERSION=2.0.0 -DJUCE_APP_VERSION_HEX=0x20000
LOCAL_LDLIBS := -llog -lGLESv2 -landroid -lEGL
else
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "C:/JUCE/modules" -O3 -std=gnu++11 -DJUCE_ANDROID=1 -DJUCE_ANDROID_API_VERSION=23 -DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_SimpleWavesGenerator -DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/SimpleWavesGenerator\" -DNDEBUG=1 -DJUCER_ANDROID_7F0E4A25=1 -DJUCE_APP_VERSION=2.0.0 -DJUCE_APP_VERSION_HEX=0x20000
LOCAL_LDLIBS := -llog -lGLESv2 -landroid -lEGL
LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "C:/JUCE/modules" -O3 -std=gnu++11 -DJUCE_ANDROID=1 -DJUCE_ANDROID_API_VERSION=23 -DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_SimpleWavesGenerator -DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/SimpleWavesGenerator\" -DNDEBUG=1 -DJUCER_ANDROID_7F0E4A25=1 -DJUCE_APP_VERSION=2.0.0 -DJUCE_APP_VERSION_HEX=0x20000
LOCAL_LDLIBS := -llog -lGLESv2 -landroid -lEGL
endif

include $(BUILD_SHARED_LIBRARY)
13 changes: 13 additions & 0 deletions Builds/Android/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Automatically generated makefile, created by the Projucer
# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!

APP_STL := gnustl_static
APP_CPPFLAGS += -fsigned-char -fexceptions -frtti -Wno-psabi
APP_PLATFORM := android-23
NDK_TOOLCHAIN_VERSION := 4.9

ifeq ($(NDK_DEBUG),1)
APP_ABI := armeabi armeabi-v7a x86
else
APP_ABI := armeabi armeabi-v7a x86
endif
10 changes: 10 additions & 0 deletions Builds/Android/local.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file is used to override default values used by the Ant build system.
# It is automatically generated by the Projucer - DO NOT EDIT IT or your changes will be lost!.

sdk.dir=C:\Android\ SDK
ndk.dir=C:\Android\ NDK\android-ndk-r12b
key.store=${user.home}/.android/debug.keystore
key.alias=androiddebugkey
key.store.password=android
key.alias.password=android

5 changes: 5 additions & 0 deletions Builds/Android/project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This file is used to override default values used by the Ant build system.
# It is automatically generated - DO NOT EDIT IT or your changes will be lost!.

target=android-23

5 changes: 5 additions & 0 deletions Builds/Android/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<string name="app_name">Simple Waves Generator</string>
</resources>
Loading

0 comments on commit 4825e00

Please sign in to comment.