Changed List to Video

Imanol-Mikel Barba Sabariego
1 parent dc98f37f
Showing 7 changed files with 102 additions and 100 deletions
gen/com/upc/pbe/upcnews/R.java
res/layout/main_activity.xml
src/com/upc/pbe/upcnews/HLS.java
src/com/upc/pbe/upcnews/MainActivity.java
src/com/upc/pbe/upcnews/ParentList.java
src/com/upc/pbe/upcnews/Parser.java
src/com/upc/pbe/upcnews/List.java → src/com/upc/pbe/upcnews/Video.java
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.upc.pbe.upcnews;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int backgroundmain=0x7f050000;
-    }
-    public static final class dimen {
-        public static final int TitleSize=0x7f060000;
-    }
-    public static final class drawable {
-        public static final int ic_action_search=0x7f020000;
-        public static final int ic_launcher=0x7f020001;
-        public static final int ic_ledarklogo=0x7f020002;
-        public static final int ic_menu_name=0x7f020003;
-        public static final int ic_startbutton=0x7f020004;
-        public static final int startbuttontoggle=0x7f020005;
-    }
-    public static final class id {
-        public static final int AbsoluteLayout1=0x7f0a0006;
-        public static final int LinearLayout1=0x7f0a0001;
-        public static final int button=0x7f0a0008;
-        public static final int itemhelp=0x7f0a000c;
-        public static final int itemprefs=0x7f0a000b;
-        public static final int listView1=0x7f0a0003;
-        public static final int menu_settings=0x7f0a000a;
-        public static final int rowTextView=0x7f0a0009;
-        public static final int textView1=0x7f0a0004;
-        public static final int textView2=0x7f0a0005;
-        public static final int textViewTitle=0x7f0a0002;
-        public static final int textViewXml=0x7f0a0007;
-        public static final int videoView1=0x7f0a0000;
-    }
-    public static final class layout {
-        public static final int activity_video=0x7f030000;
-        public static final int dirs=0x7f030001;
-        public static final int help=0x7f030002;
-        public static final int main_activity=0x7f030003;
-        public static final int rowlayout=0x7f030004;
-    }
-    public static final class menu {
-        public static final int activity_main=0x7f090000;
-        public static final int activity_video=0x7f090001;
-        public static final int menu=0x7f090002;
-    }
-    public static final class string {
-        public static final int app_name=0x7f070000;
-        public static final int button=0x7f07000c;
-        public static final int button1=0x7f07000d;
-        public static final int desc=0x7f070009;
-        public static final int descarregar=0x7f070003;
-        public static final int dir=0x7f07000a;
-        public static final int directoris=0x7f07000b;
-        public static final int hello_world=0x7f070010;
-        public static final int help=0x7f070008;
-        public static final int hint=0x7f070004;
-        public static final int menu_settings=0x7f070001;
-        public static final int prefs=0x7f070007;
-        public static final int startbuttondescription=0x7f07000f;
-        public static final int title=0x7f07000e;
-        public static final int title_activity_main=0x7f070002;
-        public static final int title_activity_video=0x7f070011;
-        public static final int url=0x7f070005;
-        public static final int urlhint=0x7f070006;
-    }
-    public static final class style {
-        public static final int AppTheme=0x7f080000;
-    }
-    public static final class xml {
-        public static final int prefs=0x7f040000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.upc.pbe.upcnews;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int backgroundmain=0x7f050000;
+    }
+    public static final class dimen {
+        public static final int TitleSize=0x7f060000;
+    }
+    public static final class drawable {
+        public static final int ic_action_search=0x7f020000;
+        public static final int ic_launcher=0x7f020001;
+        public static final int ic_ledarklogo=0x7f020002;
+        public static final int ic_menu_name=0x7f020003;
+        public static final int ic_startbutton=0x7f020004;
+        public static final int startbuttontoggle=0x7f020005;
+    }
+    public static final class id {
+        public static final int LinearLayout1=0x7f0a0001;
+        public static final int RelativeLayout1=0x7f0a0006;
+        public static final int button=0x7f0a0007;
+        public static final int itemhelp=0x7f0a000c;
+        public static final int itemprefs=0x7f0a000b;
+        public static final int listView1=0x7f0a0003;
+        public static final int menu_settings=0x7f0a000a;
+        public static final int rowTextView=0x7f0a0009;
+        public static final int textView1=0x7f0a0004;
+        public static final int textView2=0x7f0a0005;
+        public static final int textViewTitle=0x7f0a0002;
+        public static final int textViewXml=0x7f0a0008;
+        public static final int videoView1=0x7f0a0000;
+    }
+    public static final class layout {
+        public static final int activity_video=0x7f030000;
+        public static final int dirs=0x7f030001;
+        public static final int help=0x7f030002;
+        public static final int main_activity=0x7f030003;
+        public static final int rowlayout=0x7f030004;
+    }
+    public static final class menu {
+        public static final int activity_main=0x7f090000;
+        public static final int activity_video=0x7f090001;
+        public static final int menu=0x7f090002;
+    }
+    public static final class string {
+        public static final int app_name=0x7f070000;
+        public static final int button=0x7f07000c;
+        public static final int button1=0x7f07000d;
+        public static final int desc=0x7f070009;
+        public static final int descarregar=0x7f070003;
+        public static final int dir=0x7f07000a;
+        public static final int directoris=0x7f07000b;
+        public static final int hello_world=0x7f070010;
+        public static final int help=0x7f070008;
+        public static final int hint=0x7f070004;
+        public static final int menu_settings=0x7f070001;
+        public static final int prefs=0x7f070007;
+        public static final int startbuttondescription=0x7f07000f;
+        public static final int title=0x7f07000e;
+        public static final int title_activity_main=0x7f070002;
+        public static final int title_activity_video=0x7f070011;
+        public static final int url=0x7f070005;
+        public static final int urlhint=0x7f070006;
+    }
+    public static final class style {
+        public static final int AppTheme=0x7f080000;
+    }
+    public static final class xml {
+        public static final int prefs=0x7f040000;
+    }
+}
@@ -19,7 +19,7 @@
         android:contentDescription="@string/startbuttondescription"
         android:focusable="false"
         android:focusableInTouchMode="false" />
-
+    
     <TextView
         android:id="@+id/textViewXml"
         android:layout_width="wrap_content"
@@ -7,22 +7,26 @@ public class HLS {
 	static final String TAG = "HLS";
 	ArrayList<ParentList> videos;
-	int numvideo;
+	int video;
 	int quality; //0 es la más alta
 	public HLS(ArrayList<ParentList> parsed)
 	{
 		this.videos = parsed;
-		numvideo = 0;
+		video = 0;
 		quality = 0;
 	}
 	public void start()
 	{
-		for(int i = 0 ; i < videos.get(numvideo).getLists().get(quality).getSegments().size() ; i++)
+		int currentVideo = 0;
+		for(video = 0; video < videos.size(); video++)
 		{
-			Segment seg = videos.get(numvideo).getLists().get(quality).getSegments().get(i);
+			ArrayList<Video> qualities = videos.get(video).getLists();
+			while(i > videos.get(quality).getLists())
+			{
+				Segment seg = videos.get(video).getLists().get(quality).getSegments().get(i);
+			}			
 		}
 	}
-	
 }
@@ -31,8 +31,6 @@ public class MainActivity extends Activity implements OnClickListener {
 	public void onCreate(Bundle savedInstanceState) {
 		/*
 		 * FALTA:
-		 * 			Boton de un color mas oscuro al darle
-		 * 			Boton y texto centrados
 		 * 			Boton mayor resolucion
 		 */
 		super.onCreate(savedInstanceState);
@@ -8,7 +8,7 @@ public class ParentList
 	private int currentQuality;
 	private String Type, Name;
 	private boolean Default; //Estos 3 últimos son para los ext-x-media, los ext-x-stream lo IGNORAN
-	private ArrayList<List> lists; //per cada qualitat
+	private ArrayList<Video> lists; //per cada qualitat
 	public ParentList(String ID)
@@ -18,7 +18,7 @@ public class ParentList
 		Type = "";
 		Name = "";
 		Default = false;
-		lists = new ArrayList<List>(); //Lista de CALIDADES		
+		lists = new ArrayList<Video>(); //Lista de CALIDADES		
 	}
 	public String getID()
@@ -67,7 +67,7 @@ public class ParentList
 		Name = n;
 	}
-	public ArrayList<List> getLists()
+	public ArrayList<Video> getLists()
 	{
 		return lists;
 	}
@@ -40,7 +40,7 @@ public class Parser
 	{
 		ArrayList<ParentList> lists = new ArrayList<ParentList>();
 		lists.add(new ParentList(""));
-		lists.get(0).getLists().add(new List(-1));
+		lists.get(0).getLists().add(new Video(-1));
 		String[] lines = file.split("\n");
 		for (int i = 0; i < lines.length; i++)
 		{
@@ -97,7 +97,7 @@ public class Parser
 	private void sortQuality(ParentList ppls)
 	{
-		ArrayList<List> lists = ppls.getLists();
+		ArrayList<Video> lists = ppls.getLists();
 		if (lists.get(0).getQuality() == -1)
 		{
 			/*
@@ -116,7 +116,7 @@ public class Parser
 				if (lists.get(i).getQuality() < lists.get(i + 1).getQuality())
 				{
 					sorted = false;
-					List aux = lists.get(i);
+					Video aux = lists.get(i);
 					lists.set(i, lists.get(i + 1));
 					lists.set(i + 1, aux);
 				}
@@ -141,7 +141,7 @@ public class Parser
 		else
 		{
 			ParentList ppls = lists.get(currentList);
-			List pls = ppls.getLists().get(ppls.getLists().size() - 1);
+			Video pls = ppls.getLists().get(ppls.getLists().size() - 1);
 			if (!validated)
 			{
 				if (line.equals(STARTWORD))
@@ -316,7 +316,7 @@ public class Parser
 							}
 							else
 							{
-								ppls.getLists().add(new List(bandwidth));
+								ppls.getLists().add(new Video(bandwidth));
 							}
 						}
 						else if (extTag[0].equals("#EXT-X-MEDIA"))
@@ -420,7 +420,7 @@ public class Parser
 										+ " has missing arguments");
 							}
 							Parser p = new Parser(URI.substring(0, URI.lastIndexOf("/") + 1), caller);
-							List newList = p.parseFile(download.doInBackground(URI)).get(0).getLists().get(0);
+							Video newList = p.parseFile(download.doInBackground(URI)).get(0).getLists().get(0);
 							if (!GroupID.equals(ppls.getID()))
 							{
 								if (ppls.getID().equals(""))
@@ -513,7 +513,7 @@ public class Parser
 						 */
 						expectList = false;
 						Parser p = new Parser(line.substring(0, line.lastIndexOf("/") + 1), caller);
-						List newList = p.parseFile(download.doInBackground(line)).get(0).getLists().get(0);
+						Video newList = p.parseFile(download.doInBackground(line)).get(0).getLists().get(0);
 						pls.setMaxDuration(newList.getMaxDuration());
 						pls.setSequence(newList.getSequence());
 						for (int i = 0; i < newList.getSegments().size(); i++)
@@ -2,7 +2,7 @@ package com.upc.pbe.upcnews;
 import java.util.ArrayList;
-public class List
+public class Video
 {
 	private int quality;
@@ -10,7 +10,7 @@ public class List
 	private int maxDuration;
 	private ArrayList<Segment> segments; //Lista de SEGMENTOS
-	public List(int q)
+	public Video(int q)
 	{
 		quality = q;
 		segments = new ArrayList<Segment>();