Commit 5a976f7a6c51815061e3aef2c13422466cf522a1
1 parent
8cd90f7d
--no commit message
Showing
3 changed files
with
1 additions
and
9 deletions
src/com/upc/pbe/upcnews/HLS.java
@@ -29,7 +29,6 @@ public class HLS | @@ -29,7 +29,6 @@ public class HLS | ||
29 | Log.d(TAG, "Esborrat " + files[i].toString()); | 29 | Log.d(TAG, "Esborrat " + files[i].toString()); |
30 | deleteme.delete(); | 30 | deleteme.delete(); |
31 | } | 31 | } |
32 | - currentQuality = 0; | ||
33 | currentVideo = currentQuality = currentSegment = 0; | 32 | currentVideo = currentQuality = currentSegment = 0; |
34 | this.videos = parsed; | 33 | this.videos = parsed; |
35 | endReached = false; | 34 | endReached = false; |
@@ -64,10 +63,6 @@ public class HLS | @@ -64,10 +63,6 @@ public class HLS | ||
64 | return seg.getURL(); | 63 | return seg.getURL(); |
65 | } | 64 | } |
66 | 65 | ||
67 | - public long getCurrentSegmentDuration() | ||
68 | - { | ||
69 | - return (long) segments.get(currentSegment).getDuration(); | ||
70 | - } | ||
71 | 66 | ||
72 | public void updateQuality(long bps) | 67 | public void updateQuality(long bps) |
73 | { | 68 | { |
src/com/upc/pbe/upcnews/ResourceAdapter.java
@@ -3,7 +3,6 @@ package com.upc.pbe.upcnews; | @@ -3,7 +3,6 @@ package com.upc.pbe.upcnews; | ||
3 | import android.app.Activity; | 3 | import android.app.Activity; |
4 | import android.content.Context; | 4 | import android.content.Context; |
5 | import android.graphics.Color; | 5 | import android.graphics.Color; |
6 | -import android.graphics.Typeface; | ||
7 | import android.view.LayoutInflater; | 6 | import android.view.LayoutInflater; |
8 | import android.view.View; | 7 | import android.view.View; |
9 | import android.view.ViewGroup; | 8 | import android.view.ViewGroup; |
@@ -52,7 +51,6 @@ public class ResourceAdapter extends ArrayAdapter<String> { | @@ -52,7 +51,6 @@ public class ResourceAdapter extends ArrayAdapter<String> { | ||
52 | } | 51 | } |
53 | //Si no, posem el text en blau i l'icono de directori | 52 | //Si no, posem el text en blau i l'icono de directori |
54 | else{ | 53 | else{ |
55 | - row.setTypeface(null,Typeface.NORMAL); | ||
56 | row.setTextColor(((Activity)context).getResources().getColor(R.color.BlueAndroid)); | 54 | row.setTextColor(((Activity)context).getResources().getColor(R.color.BlueAndroid)); |
57 | rowImage.setImageResource(R.drawable.folder); | 55 | rowImage.setImageResource(R.drawable.folder); |
58 | } | 56 | } |
src/com/upc/pbe/upcnews/VideoActivity.java
@@ -143,8 +143,7 @@ public class VideoActivity extends Activity { | @@ -143,8 +143,7 @@ public class VideoActivity extends Activity { | ||
143 | queue.remove(0); | 143 | queue.remove(0); |
144 | if(ended && queue.isEmpty()) | 144 | if(ended && queue.isEmpty()) |
145 | { | 145 | { |
146 | - VideoActivity.super.finish(); | ||
147 | - return; | 146 | + quitPlayer(); |
148 | } | 147 | } |
149 | if(queue.isEmpty()) | 148 | if(queue.isEmpty()) |
150 | { | 149 | { |