Update for HTSP Lib v0.0.1a22

kiall · Apr 24, 2017 · 18a3bac · 18a3bac
1 parent d9435a4
commit 18a3bac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -68,7 +68,7 @@ repositories {
 }
 
 dependencies {
-    compile 'ie.macinnes.htsp:android-htsp:v0.0.1a19'
+    compile 'ie.macinnes.htsp:android-htsp:v0.0.1a22'
     // Used for testing local HTSP lib builds
 //    compile(name: 'library-debug', ext: 'aar')
     compile fileTree(include: ['*.jar'], dir: 'libs')

diff --git a/app/src/main/java/ie/macinnes/tvheadend/player/HtspDataSource.java b/app/src/main/java/ie/macinnes/tvheadend/player/HtspDataSource.java
@@ -93,7 +93,8 @@ public HtspDataSource(Context context, SimpleHtspConnection connection, String s
             throw new RuntimeException("OutOfMemoryError when allocating HtspDataSource buffer", e);
         }
 
-        mSubscriber = new Subscriber(mConnection, this);
+        mSubscriber = new Subscriber(mConnection);
+        mSubscriber.addSubscriptionListener(this);
         mConnection.addAuthenticationListener(mSubscriber);
     }
 
@@ -168,7 +169,9 @@ public void close() throws IOException {
         mIsOpen = false;
 
         mConnection.removeAuthenticationListener(mSubscriber);
+        mSubscriber.removeSubscriptionListener(this);
         mSubscriber.unsubscribe();
+        mSubscriber = null;
 
         // Watch for memory leaks
         Application.getRefWatcher(mContext).watch(this);