Merge branch 'master' of https://github.com/Vajnar/orte

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..f2fd238
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,12 @@
+language: c
+# before_install:
+#   - sudo apt-get update -qq
+#   - sudo apt-get install -qq uncrustify
+install:
+  - wget http://downloads.sourceforge.net/project/uncrustify/uncrustify/uncrustify-0.59/uncrustify-0.59.tar.gz
+  - tar -xzvf uncrustify-0.59.tar.gz
+  - ( cd uncrustify-0.59 && ./configure --prefix=$HOME/local && make && make install )
+  - export PATH=$PATH:$HOME/local/bin
+script:
+  - make
+  - ./orte/uncrustify && git diff --exit-code

diff --git a/orte/contrib/Robot_Demo/AndroidManifest.xml b/orte/contrib/Robot_Demo/AndroidManifest.xml
index c4f4259995de3658ba0ede0cf63da7e6e9712376..7707948ba9a3886a09b2b220ef6bc4e20456d15b 100644 (file)
--- a/orte/contrib/Robot_Demo/AndroidManifest.xml
+++ b/orte/contrib/Robot_Demo/AndroidManifest.xml
@@ -5,8 +5,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="15" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="22" />
     
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

diff --git a/orte/contrib/Robot_Demo/project.properties b/orte/contrib/Robot_Demo/project.properties
index f5a9ea3992c759f2bf6642ca2ebecf99eb280dbc..2e6404d2718db92352f9d15e76856e9fa421b873 100644 (file)
--- a/orte/contrib/Robot_Demo/project.properties
+++ b/orte/contrib/Robot_Demo/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-22
 android.library.reference.1=../../libaorte

diff --git a/orte/contrib/shape/MainForm.cpp b/orte/contrib/shape/MainForm.cpp
index a3e661e73a7624916e41c49c5701234f15d677e6..2fc8d9f1a8459d440d0f5ab4dd0172163c6cb601 100644 (file)
--- a/orte/contrib/shape/MainForm.cpp
+++ b/orte/contrib/shape/MainForm.cpp
@@ -14,7 +14,7 @@ MainForm::MainForm(QWidget *parent)
 void MainForm::about()
 {
     QMessageBox::about( this, "ORTE application demo",
-                        "This application demonstrates usege of ORTE library\n\n"
+                        "This application demonstrates usage of ORTE library\n\n"
                        "Petr Smolik (c) 2004-2008\n"
                        "OCERA team");
 }

diff --git a/orte/contrib/shape_android/AndroidManifest.xml b/orte/contrib/shape_android/AndroidManifest.xml
index 95c100ae9ddc6b9a981328594c52f7f4a18e246c..3c49091ceced62e0356fef4683570e15486524c7 100644 (file)
--- a/orte/contrib/shape_android/AndroidManifest.xml
+++ b/orte/contrib/shape_android/AndroidManifest.xml
@@ -5,8 +5,8 @@
     android:versionName="1.2" >
 
     <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="21" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/orte/contrib/shape_android/project.properties b/orte/contrib/shape_android/project.properties
index 3690b9984a984f2336bbd995e30b824096a5e1ac..2e6404d2718db92352f9d15e76856e9fa421b873 100644 (file)
--- a/orte/contrib/shape_android/project.properties
+++ b/orte/contrib/shape_android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-22
 android.library.reference.1=../../libaorte

diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/BoxType.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/BoxType.java
index d9e8d08f96f62a838e97c34edaf5caf91868ef99..a51f3e7f189d48408c09ee89343cde39e7d3c997 100644 (file)
--- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/BoxType.java
+++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/BoxType.java
@@ -59,7 +59,6 @@ public class BoxType extends MessageData
                }
                
                this.allowScaling = true;
-               this.buffer.order(null); // set buffer to Little endian (Shape uses this)
        }
 
        /* (non-Javadoc)

diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java
index 11e8bab8335a6e12e232457b91b002a31bb08aeb..557482de86fc4dcffbc4b5b7430902d090eee2d8 100644 (file)
--- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java
+++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java
@@ -171,7 +171,15 @@ public class PublisherActivity extends Activity {
        public void onDestroy()
        {
                super.onDestroy();
-               
+
+               handler.removeCallbacks(redraw);
+
+               for (PublisherShape shape : publisherView.shapes)
+                       shape.killMe();
+
+               for (SubscriberElement element : subscriberView.elements)
+                       element.killMe();
+
                if (appDomain != null) {
                        appDomain.destroy();
                        appDomain = null;

diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java
index daf55adb4b988d6e8def4c49403eb16d8d08d06e..212be3f016208255eb5f19ce51e4d76cecb9e81e 100644 (file)
--- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java
+++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java
@@ -312,7 +312,10 @@ public class PublisherShape extends ShapeDrawable
         */
        public void killMe()
        {
-               this.publication.destroy();
+               if (this.publication != null) {
+                       this.publication.destroy();
+                       this.publication = null;
+               }
        }
        
        /**

diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SubscriberElement.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SubscriberElement.java
index a16326ae5bd90a793588c7868a4d3eeec7429a14..6b74f63fc900cd2f72437e95f0ff5dca108fdd40 100644 (file)
--- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SubscriberElement.java
+++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SubscriberElement.java
@@ -243,4 +243,15 @@ public class SubscriberElement extends SubscriptionCallback
                this.setShape();
        }
 
+        /**
+         * When subscriber is removed, destroy subscription.
+         * 
+         * @since 1.0
+         */
+       public void killMe() {
+               if (this.subscription != null) {
+                       this.subscription.destroy();
+                       this.subscription = null;
+               }
+       }
 }

diff --git a/orte/libaorte/AndroidManifest.xml b/orte/libaorte/AndroidManifest.xml
index a77b1afe966c04c1d14318051296414864643c1d..8ca533c0614f61aeefe17b1864408342e6c80501 100644 (file)
--- a/orte/libaorte/AndroidManifest.xml
+++ b/orte/libaorte/AndroidManifest.xml
@@ -4,8 +4,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="15" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="22" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
 

diff --git a/orte/libaorte/project.properties b/orte/libaorte/project.properties
index 36f15941e2b3cb1b903fab5bfa381722f79cef55..362a0a3082a0075437e3842426c2418f204cc366 100644 (file)
--- a/orte/libaorte/project.properties
+++ b/orte/libaorte/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-22
 android.library=true