Closes AndroidAalto#3 SoundFused renamed to SoundFuse. Project must be

refreshed.
jush · Jun 25, 2011 · f3dacbd · f3dacbd
1 parent d465cc4
commit f3dacbd
Show file tree

Hide file tree

Showing 23 changed files with 92 additions and 92 deletions.
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>soundfused</name>
+	<name>SoundFuse</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -4,27 +4,27 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.androidaalto.soundfused"
+    package="org.androidaalto.soundfuse"
     android:versionCode="1"
     android:versionName="1.0">
     <uses-sdk

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ all: debug
 run: run-debug
 
 run-debug: debug
-	adb shell am start -a android.intent.action.MAIN -n org.androidaalto.soundfused/.BoardActivity
+	adb shell am start -a android.intent.action.MAIN -n org.androidaalto.soundfuse/.BoardActivity
 
 debug: build.xml
 	ant debug

diff --git a/res/layout/add_columns.xml b/res/layout/add_columns.xml
@@ -10,7 +10,7 @@
 		android:layout_width='fill_parent' android:layout_height='wrap_content'
 		android:textAppearance='?android:attr/textAppearanceMedium'
 		android:layout_marginBottom='10dp' />
-	<org.androidaalto.soundfused.picker.NumberPicker
+	<org.androidaalto.soundfuse.picker.NumberPicker
 		android:id="@+id/pref_num_picker" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/res/layout/board.xml b/res/layout/board.xml
@@ -4,20 +4,20 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/

diff --git a/res/layout/fileexplorer_main.xml b/res/layout/fileexplorer_main.xml
@@ -4,20 +4,20 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/

diff --git a/res/layout/fileexplorer_row.xml b/res/layout/fileexplorer_row.xml
@@ -4,20 +4,20 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/

diff --git a/res/layout/number_picker.xml b/res/layout/number_picker.xml
@@ -19,7 +19,7 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <org.androidaalto.soundfused.picker.NumberPickerButton android:id="@+id/increment"
+    <org.androidaalto.soundfuse.picker.NumberPickerButton android:id="@+id/increment"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_up_btn" />
@@ -35,7 +35,7 @@
         android:textSize="30sp"
         android:background="@drawable/timepicker_input" />
 
-    <org.androidaalto.soundfused.picker.NumberPickerButton android:id="@+id/decrement"
+    <org.androidaalto.soundfuse.picker.NumberPickerButton android:id="@+id/decrement"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_down_btn" />

diff --git a/res/menu/menu.xml b/res/menu/menu.xml
@@ -4,20 +4,20 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -4,25 +4,25 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/
 -->
 <resources>
     <string name="hello">Hello World, MainActivity!</string>
-    <string name="app_name">Soundfused</string>
+    <string name="app_name">SoundFuse</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
@@ -3,20 +3,20 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/

diff --git a/res/values/themes.xml b/res/values/themes.xml
@@ -3,20 +3,20 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/

diff --git a/...roidaalto/soundfused/AddColumnPicker.java → ...droidaalto/soundfuse/AddColumnPicker.java b/...roidaalto/soundfused/AddColumnPicker.java → ...droidaalto/soundfuse/AddColumnPicker.java
@@ -2,27 +2,27 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/
 
-package org.androidaalto.soundfused;
+package org.androidaalto.soundfuse;
 
-import org.androidaalto.soundfused.picker.NumberPicker;
+import org.androidaalto.soundfuse.picker.NumberPicker;
 
 import android.app.Activity;
 import android.content.Intent;

diff --git a/...roidaalto/soundfused/AndroidExplorer.java → ...droidaalto/soundfuse/AndroidExplorer.java b/...roidaalto/soundfused/AndroidExplorer.java → ...droidaalto/soundfuse/AndroidExplorer.java
@@ -2,25 +2,25 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/
 
-package org.androidaalto.soundfused;
+package org.androidaalto.soundfuse;
 
 // taken from http://android-er.blogspot.com/2010/01/implement-simple-file-explorer-in.html
 // adapted to show only desired formats

diff --git a/...ndroidaalto/soundfused/BoardActivity.java → ...androidaalto/soundfuse/BoardActivity.java b/...ndroidaalto/soundfused/BoardActivity.java → ...androidaalto/soundfuse/BoardActivity.java
@@ -2,27 +2,27 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/
 
-package org.androidaalto.soundfused;
+package org.androidaalto.soundfuse;
 
-import org.androidaalto.soundfused.sequencer.Sequencer;
+import org.androidaalto.soundfuse.sequencer.Sequencer;
 
 import android.app.Activity;
 import android.content.Context;

diff --git a/.../androidaalto/soundfused/Preferences.java → ...g/androidaalto/soundfuse/Preferences.java b/.../androidaalto/soundfused/Preferences.java → ...g/androidaalto/soundfuse/Preferences.java
@@ -2,25 +2,25 @@
 
    Copyright: 2011 Android Aalto Community
 
-   This file is part of SoundFused.
+   This file is part of SoundFuse.
 
-   SoundFused is free software; you can redistribute it and/or modify
+   SoundFuse is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   SoundFused is distributed in the hope that it will be useful,
+   SoundFuse is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with SoundFused; if not, write to the Free Software
+   along with SoundFuse; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  ******************************************************************************/
 
-package org.androidaalto.soundfused;
+package org.androidaalto.soundfuse;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;