From 5a976f7a6c51815061e3aef2c13422466cf522a1 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Sun, 16 Dec 2012 16:31:34 +0000
Subject: [PATCH] 

---
 src/com/upc/pbe/upcnews/HLS.java             | 5 -----
 src/com/upc/pbe/upcnews/ResourceAdapter.java | 2 --
 src/com/upc/pbe/upcnews/VideoActivity.java   | 3 +--
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/com/upc/pbe/upcnews/HLS.java b/src/com/upc/pbe/upcnews/HLS.java
index fb26313..19fc7ef 100644
--- a/src/com/upc/pbe/upcnews/HLS.java
+++ b/src/com/upc/pbe/upcnews/HLS.java
@@ -29,7 +29,6 @@ public class HLS
 			Log.d(TAG, "Esborrat " + files[i].toString());
 			deleteme.delete();
 		}
-		currentQuality = 0;
 		currentVideo = currentQuality = currentSegment = 0;
 		this.videos = parsed;
 		endReached = false;
@@ -64,10 +63,6 @@ public class HLS
 		return seg.getURL();
 	}
 	
-	public long getCurrentSegmentDuration()
-	{
-		return (long) segments.get(currentSegment).getDuration();
-	}
 	
 	public void updateQuality(long bps)
 	{
diff --git a/src/com/upc/pbe/upcnews/ResourceAdapter.java b/src/com/upc/pbe/upcnews/ResourceAdapter.java
index b1bc697..db26ca3 100644
--- a/src/com/upc/pbe/upcnews/ResourceAdapter.java
+++ b/src/com/upc/pbe/upcnews/ResourceAdapter.java
@@ -3,7 +3,6 @@ package com.upc.pbe.upcnews;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -52,7 +51,6 @@ public class ResourceAdapter extends ArrayAdapter<String> {
 	     }
 	     //Si no, posem el text en blau i l'icono de directori
 	     else{
-	    	 row.setTypeface(null,Typeface.NORMAL);
 	    	 row.setTextColor(((Activity)context).getResources().getColor(R.color.BlueAndroid));
 	    	 rowImage.setImageResource(R.drawable.folder);
 	     }
diff --git a/src/com/upc/pbe/upcnews/VideoActivity.java b/src/com/upc/pbe/upcnews/VideoActivity.java
index ab32324..aef0aa1 100644
--- a/src/com/upc/pbe/upcnews/VideoActivity.java
+++ b/src/com/upc/pbe/upcnews/VideoActivity.java
@@ -143,8 +143,7 @@ public class VideoActivity extends Activity {
 			queue.remove(0);
 	    	if(ended && queue.isEmpty())
 	    	{
-	    		VideoActivity.super.finish();
-	    		return;
+	    		quitPlayer();
 	    	}
 	    	if(queue.isEmpty())
 	    	{
--
libgit2 0.22.2