--no commit message

Imanol-Mikel Barba Sabariego
1 parent ba5a364f
Showing 17 changed files with 353 additions and 578 deletions
res/layout/help.xml
src/com/upc/pbe/upcnews/BandwidthMeasurer.java
src/com/upc/pbe/upcnews/Descarrega.java
src/com/upc/pbe/upcnews/Directoris.java
src/com/upc/pbe/upcnews/ErrorException.java
src/com/upc/pbe/upcnews/HLS.java
src/com/upc/pbe/upcnews/HTMLParser.java
src/com/upc/pbe/upcnews/Help.java
src/com/upc/pbe/upcnews/InfoException.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/Prefs.java
src/com/upc/pbe/upcnews/ResourceAdapter.java
src/com/upc/pbe/upcnews/Segment.java
src/com/upc/pbe/upcnews/Video.java
src/com/upc/pbe/upcnews/WarningException.java
@@ -23,6 +23,7 @@
             android:id="@+id/textView2"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:gravity="center_horizontal"
             android:text="@string/helpText" />
     </ScrollView>
@@ -2,22 +2,20 @@ package com.upc.pbe.upcnews;
 import android.net.TrafficStats;
-public class BandwidthMeasurer
-{
-	public double Measure(long rxBytes, long Time)
-	{
+//Mesura la velocitat (Bandwidth) d'Internet
+public class BandwidthMeasurer{
+	
+	public double Measure(long rxBytes, long Time){
 		long AfterTime = System.currentTimeMillis();
 	    double bps;
 		long TotalRxAfterTest = TrafficStats.getTotalRxBytes();
 		double TimeDifference = AfterTime - Time;
 		double rxDiff = TotalRxAfterTest - rxBytes;
-		if(rxDiff != 0)
-		{
+		if(rxDiff != 0){
 			bps = ((rxDiff*8) / (TimeDifference/1000)); // total rx bits per second.
 		}
-		else
-		{
+		else{
 			bps = -1; //No transmitted data
 		}
 		return bps;
@@ -14,47 +14,43 @@ import java.net.URLConnection;
 import android.os.AsyncTask;
 import android.util.Log;
+//Descarrega un arxiu i el guarda o retorna en String
 public class Descarrega extends AsyncTask<Object, Object, Object> {
+	
 	final static String TAG = "Descarrega";
-	private String url;
-	private String carpeta;
-	private String nomarxiu;
-	private String html;
+	private String url, carpeta, nomarxiu, html;
 	private File arxiu;
 	public Descarrega() {
 		nomarxiu = "ejemplo.xml";
 		carpeta = "Environment.getExternalStorageDirectory.getPath()";
-
 		this.carpeta = null;
 		this.html = "";
 		this.arxiu = null;
 	}
 	public void descarregarguardar(String u, String nom, String car) {
+		//Descarrega un arxiu i el guarda
 		this.nomarxiu = nom;
 		this.carpeta = car;
 		this.url = u;
-		// Creem el directori
+		//Creem el directori
 		File dir = new File(carpeta);
 		if (!dir.exists()) {
 			if (!dir.mkdir()) {
 				return; // No s'ha pogut crear (ja existeix)
 			}
 		}
-
-		// Creem l'arxiu
+		//Creem l'arxiu
 		arxiu = new File(carpeta + nomarxiu);
-
-		// Iniciem la descÃ rrega
+		//Iniciem la descarrega
 		try {
 			URLConnection conn = new URL(url).openConnection();
 			conn.connect();
 			Log.d(TAG, "\nDescarregant: \n");
 			Log.d(TAG, " >> URL: " + url + " >> Nom: " + nomarxiu
 					+ " >> Tamany: " + conn.getContentLength() + " bytes");
-
-			// Llegeix cada byte i l'escriu en un arxiu fins que arriba a -1
+			//Llegeix cada byte i l'escriu en un arxiu fins que arriba a -1
 			InputStream in = conn.getInputStream();
 			OutputStream out = new FileOutputStream(arxiu);
 			int b = 0;
@@ -66,7 +62,6 @@ public class Descarrega extends AsyncTask&lt;Object, Object, Object&gt; {
 			}
 			out.close();
 			in.close();
-
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
@@ -75,30 +70,27 @@ public class Descarrega extends AsyncTask&lt;Object, Object, Object&gt; {
 	}
 	protected String doInBackground(String u) throws IOException {
+		//Descarrega un arxiu i el retorna en un String
 		this.url = u;
 		html = "";
-
-			URLConnection conn = new URL(url).openConnection();
-			BufferedReader in = new BufferedReader(new InputStreamReader(
-					conn.getInputStream()));
-			Log.d(TAG, "\nDescarregant: \n");
-			Log.d(TAG,
-					">> URL: " + url + " >> Tamany: " + conn.getContentLength()
-							+ " bytes");
-			String inputLine;
-			while ((inputLine = in.readLine()) != null) {
-				html = html + "\n" + inputLine;
-			}
-			Log.d(TAG, "Descarrega finalitzada");
-
-			in.close();
+		//Iniciem la connexió i creem els Streams
+		URLConnection conn = new URL(url).openConnection();
+		BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+		//Iniciem la descarrega i anem guardant al String
+		Log.d(TAG, "\nDescarregant: \n");
+		Log.d(TAG, ">> URL: " + url + " >> Tamany: " + conn.getContentLength()+ " bytes");
+		String inputLine;
+		while ((inputLine = in.readLine()) != null) {
+			html = html + "\n" + inputLine;
+		}
+		Log.d(TAG, "Descarrega finalitzada");
+		in.close();
 		return html;
-
 	}
 	@Override
 	protected Object doInBackground(Object... arg0) {
-
+		//Metode Overrided, no te utilitat
 		return null;
 	}
 }
@@ -17,71 +17,44 @@ import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Toast;
-public class Directoris extends Activity implements OnItemClickListener
-{
+//Segona Activity, mostra els directoris i arxius del servidor
+public class Directoris extends Activity implements OnItemClickListener {
+	
 	final static String TAG = "Directoris";
 	private Descarrega d = new Descarrega();
-	private String URL;
-	private String currentFolder;
+	private String URL, currentFolder;
 	private HTMLParser parser;
-	public void onCreate(Bundle savedInstanceState)
-	{
+	public void onCreate(Bundle savedInstanceState){
+		//Creem el layout
 		Log.d(TAG, "onCreated");
-
-		
 		super.onCreate(savedInstanceState);
+		//Passem del layout anterior al actual
 		setContentView(R.layout.dirs);
-
+		//Canviem la direccio de la URL a la actual
 		currentFolder = ((UpcApp) getApplication()).getUrl() + "/";
 		URL = currentFolder;
+		//Creem un HTMLParser
 		parser = new HTMLParser(URL);
-		
+		//Fem una llista ListView i la omplim amb la informacio trobada
 		((ListView)findViewById(R.id.listView1)).setOnItemClickListener(this);
-		
 		this.showResources();
 	}
-
-	public boolean onCreateOptionsMenu(Menu menu)
-	{
-		getMenuInflater().inflate(R.menu.menu, menu);
-		Log.d(TAG, "Menu");
-		return true;
-	}
-
-	public boolean onOptionsItemSelected(MenuItem item)
-	{
-		switch (item.getItemId())
-		{
-		case R.id.itemprefs:
-			startActivity(new Intent(this, Prefs.class));
-			Log.d(TAG, "Preferences");
-			return true;
-		case R.id.itemhelp:
-			startActivity(new Intent(this, Help.class));
-			Log.d(TAG, "Help");
-			return true;
-		default:
-			return false;
-		}
-	}
-	public void showResources()
-	{
+	public void showResources(){
+		//Actualitza la informacio que mostra la ListView a mesura que ens desplacem pels directoris
 		ArrayList<String> entries;
-		try
-		{
+		try{
 			entries = parser.parse(d.doInBackground(currentFolder));
 			this.createEntries(entries);
 		}
-		catch (IOException e)
-		{
-			// Nunca llegarÃ¡ aquÃ la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
+		catch (IOException e){
+			// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
 		}
 	}
-	public void createEntries(ArrayList<String> directories)
-	{
+	public void createEntries(ArrayList<String> directories){
+		//Crea les entrades de la ListView
 		String[] entries = directories.toArray(new String[directories.size()]);
 		ListView listView = (ListView) findViewById(R.id.listView1);
 		listView.setAdapter(null);
@@ -89,68 +62,79 @@ public class Directoris extends Activity implements OnItemClickListener
 		listView.setAdapter(adapter);
 	}
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) 
-	{
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		//Determina el funcionament al clickar en una de les entrades de al ListView
 		String path = ((TextView)view).getText().toString();
-		if(path.endsWith(".m3u8"))
-		{
+		//Si es un m3u8, el descarrega, parseja i inicia la reproducció
+		if(path.endsWith(".m3u8")){
 			path = currentFolder + path;
 			String playlist;
-			try
-			{
-					playlist = d.doInBackground(path);
-				
+			try{
+				playlist = d.doInBackground(path);
 				Parser p = new Parser(path.substring(0, path.lastIndexOf("/") + 1), this);
-				try
-				{
+				try{
 					ArrayList<ParentList> m3u8parsed = p.parseFile(playlist);
 					Log.d(TAG, "parsing completed");
 					HLS h = new HLS(m3u8parsed,((UpcApp)getApplication()).getLocalPath());
 					h.start();
 				}
-				catch (ErrorException e)
-				{
+				catch (ErrorException e){
 					Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
 					Log.d(TAG, e.getMessage());
 				}
-				catch (WarningException e)
-				{
+				catch (WarningException e){
 					Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
 					Log.d(TAG, e.getMessage());
 				}
-				catch (InfoException e)
-				{
+				catch (InfoException e){
 					Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
 					Log.d(TAG, e.getMessage());
 				}
 			}
-			catch (IOException e1)
-			{
-				// Nunca llegarÃ¡ aquÃ la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
+			catch (IOException e1){
+				// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
 			}
 		}
-		else //Se trata de una carpeta
-		{	
-			if(!path.startsWith("http://"))
-			{
+		//Si es una carpeta, hi entra i mostra el seu contingut
+		else{
+			if(!path.startsWith("http://")){
 				currentFolder += path;
 			}
-			else
-			{
+			else{
 				currentFolder = path;
 			}
 			showResources();
 		}
-	} 
-	
+	}
+
+	public boolean onCreateOptionsMenu(Menu menu){
+		//Determina el funcionament al apretar la tecla d'opcions
+		getMenuInflater().inflate(R.menu.menu, menu);
+		Log.d(TAG, "Menu");
+		return true;
+	}
+
+	public boolean onOptionsItemSelected(MenuItem item){
+		//Determina el funcionament al clickar en el menu d'opcions
+		switch (item.getItemId()){
+			case R.id.itemprefs:
+				startActivity(new Intent(this, Prefs.class));
+				Log.d(TAG, "Preferences");
+				return true;
+			case R.id.itemhelp:
+				startActivity(new Intent(this, Help.class));
+				Log.d(TAG, "Help");
+				return true;
+			default:
+				return false;
+		}
+	}
-	
 	public boolean onKeyDown(int keyCode, KeyEvent event)  {
-	    if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) 
-	    {
-	    	if(currentFolder.equals(URL))
-	    	{
+		//Determina el funcionament al apretar la tecla de tornar enrere
+	    if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0){
+	    	if(currentFolder.equals(URL)){
 	    		super.finish();
 		        return true;
 	    	}
 package com.upc.pbe.upcnews;
-public class ErrorException extends Exception
-{
+//Excepcio d'error critic, finalitza l'aplicacio
+public class ErrorException extends Exception {
+	
 	private static final long serialVersionUID = 1L;
-	public ErrorException(String message)
-	{
+	
+	public ErrorException(String message){
 		super(message);
 	}
 }
@@ -4,20 +4,20 @@ import java.util.ArrayList;
 import android.util.Log;
+//Gestor del protocol HTTP Live Streaming
 public class HLS {
 	private static final String TAG = "HLS";
 	private ArrayList<ParentList> videos;
 	private int currentVideo ;
-	private int currentQuality; //0 es la más alta
+	private int currentQuality; //0 es la mas alta
 	private int currentSegment;
 	private boolean endReached;
 	private String localFolder;
 	//private fileDownloader fd;
 	private BandwidthMeasurer bm;
-	public HLS(ArrayList<ParentList> parsed, String localFolder)
-	{
+	public HLS(ArrayList<ParentList> parsed, String localFolder){
 		currentVideo = currentQuality = currentSegment = 0;
 		this.videos = parsed;
 		endReached = false;
@@ -25,32 +25,26 @@ public class HLS {
 		bm = new BandwidthMeasurer();
 	}
-	public void start()
-	{
-		for(currentVideo = 0; currentVideo < videos.size(); currentVideo++)
-		{
+	public void start(){
+		for(currentVideo = 0; currentVideo < videos.size(); currentVideo++){
 			ArrayList<Video> qualities = videos.get(currentVideo++).getLists();
-			while(!endReached)
-			{
+			while(!endReached){
 				ArrayList<Segment> segments = qualities.get(currentQuality).getSegments(); 
-				while(true)
-				{
+				while(true){
 					Segment seg = segments.get(currentSegment++);
 					Log.d(TAG, seg.getName() + " " + seg.getURL());
 					long startTime = System.currentTimeMillis();
 					//long segmentBytes = fd.Download(seg.getURL(),localFolder);
 					long segmentBytes = 0;
 					double bps = bm.Measure(segmentBytes,startTime);
-					if((bps < qualities.get(currentQuality).getQuality()) && (bps != -1))
-					{
+					if((bps < qualities.get(currentQuality).getQuality()) && (bps != -1)){
 						currentQuality++;
 						break;
 					}
 					 /*
 					  * REPRODUCIR SEGMENTO
 					  */
-					if(currentSegment == segments.size())
-					{
+					if(currentSegment == segments.size()){
 						endReached = true;
 						break;
 					}
@@ -58,4 +52,4 @@ public class HLS {
 			}		
 		}
 	}
-}
+}
 \ No newline at end of file
@@ -4,23 +4,23 @@ import java.util.ArrayList;
 import android.util.Log;
-public class HTMLParser
-{
+//Parseja arxius HTML
+public class HTMLParser {
+	
 	private final static String TAG = "HTMLParser";
-	private ArrayList<String> resources;
-	private String server;
+	private ArrayList<String> resources; //Llista de recursos trobats
+	private String server; //URL Server
-	public HTMLParser(String u)
-	{
+	public HTMLParser(String u){
+		//Separem host i server en la direccio donada
 		String host = u.substring(7);
 		server = u.substring(0,host.indexOf("/")+7);
 		resources = new ArrayList<String>();
 	}
-	public ArrayList<String> parse(String code)
-	{
-		if(!resources.isEmpty())
-		{
+	public ArrayList<String> parse(String code){
+		//Metode principal, nejetem la llista si hi ha continguts i parsejem
+		if(!resources.isEmpty()){
 			resources.clear();
 		}
 		parseDirectories(resources,code);
@@ -28,38 +28,28 @@ public class HTMLParser
 		return resources;
 	}
-	public void parseDirectories(ArrayList<String> resources, String code)
-	{
-		// Separem el codi en linies
+	public void parseDirectories(ArrayList<String> resources, String code){
+		//Busca directoris en un arxiu HTML
+		//Separem el codi en linies
 		String[] split = code.split("\n");
-		/*
-		 * Busquemos el tag <a>, descartando comentarios:
-		 */
-		for (int i = 0; i < split.length; i++)
-		{
-			while (split[i].startsWith("<!--"))
-			{
-				if (split[i++].endsWith("-->"))
-				{
+		//Busquem el tag <a>, descartant comentaris:
+		for (int i = 0; i < split.length; i++){
+			while (split[i].startsWith("<!--")){
+				if (split[i++].endsWith("-->")){
 					break;
 				}
 			}
-			// Posible comentario descartado
-			if (split[i].indexOf("<a ") != -1) //Enlace
-			{
-				if (split[i].indexOf("href=") != -1) //Esto tiene buena pinta
-				{
-					String dirpath = split[i].substring(split[i].indexOf("href=\"") + 6); //Eliminamos morralla del principio.
-					dirpath = dirpath.substring(0, dirpath.indexOf("\"")); //Quitamos la morralla del final, nos queda el valor de href sÃ³lo.
-					if(dirpath.lastIndexOf("/") != -1) //Mira que sea una carpeta y no un fichero suelto.
-					{
-						dirpath = dirpath.substring(0,dirpath.lastIndexOf("/")+1); //Elimina parte que no es carpeta
-						if(dirpath.startsWith("/"))
-						{
+			// Posible comentari descartat
+			if (split[i].indexOf("<a ") != -1){ //Enllaç  
+				if (split[i].indexOf("href=") != -1) { //Aixo te bona pinta
+					String dirpath = split[i].substring(split[i].indexOf("href=\"") + 6); //Eliminem morralla del principi.
+					dirpath = dirpath.substring(0, dirpath.indexOf("\"")); //Treiem la morralla del final, ens queda el valor de href.
+					if(dirpath.lastIndexOf("/") != -1) { //Mira que sigui una carpeta y no un arxiu sol.
+						dirpath = dirpath.substring(0,dirpath.lastIndexOf("/")+1); //Elimina la part que no es carpeta
+						if(dirpath.startsWith("/")){
 							dirpath = server + dirpath;
 						}
-						if(!resources.contains(dirpath)) //No seamos repetitivos
-						{
+						if(!resources.contains(dirpath)) { //No siguem repetitius
 							resources.add(dirpath);
 						}
 						Log.d(TAG, "DIRECTORY FOUND: " + dirpath);
@@ -69,40 +59,32 @@ public class HTMLParser
 		}
 	}
-	public void parseFiles(ArrayList<String> resources, String code)
-	{
+	public void parseFiles(ArrayList<String> resources, String code){
+		//Parseja arxius en un arxiu HTML
+		//Separem el codi en linies
 		String[] split = code.split("\n");
-		for (int i = 0; i < split.length; i++)
-		{
-			while (split[i].startsWith("<!--"))
-			{
-				if (split[i++].endsWith("-->"))
-				{
+		for (int i = 0; i < split.length; i++){
+			while (split[i].startsWith("<!--")){
+				if (split[i++].endsWith("-->")){
 					break;
 				}
 			}
-			// Posible comentario descartado
-			if (split[i].contains("<a ")) //Enlace
-			{
-				if (split[i].contains("href=")) //Esto tiene buena pinta
-				{
-					String filepath = split[i].substring(split[i].indexOf("href=\"") + 6); //Eliminamos morralla del principio.
-					filepath = filepath.substring(0, filepath.indexOf("\"")); //Quitamos la morralla del final, nos queda el valor de href sÃ³lo.
-					if(filepath.endsWith(".m3u8")) //Mira que sea una lista.
-					{
+			// Possible comentari descartat
+			if (split[i].contains("<a ")) { //Enllaç
+				if (split[i].contains("href=")) { //Aixo te bona pinta
+					String filepath = split[i].substring(split[i].indexOf("href=\"") + 6); //Eliminem morralla del principi.
+					filepath = filepath.substring(0, filepath.indexOf("\"")); //Treiem la morralla del final, ens queda el valor de href.
+					if(filepath.endsWith(".m3u8")) { //Mira que sigui una llista.
 						String filename;
-						//Deteccion de ficheros ocultos
-						if(filepath.indexOf("/") != -1)
-						{
+						//Deteccio d'arxius ocults
+						if(filepath.indexOf("/") != -1){
 							filename = filepath.substring(filepath.lastIndexOf("/"));
 						}
-						else
-						{
+						else{
 							filename = filepath;
 						}
-						if(!filename.startsWith("."))
-						{
-							if(!resources.contains(filepath)) //No seamos repetitivos
+						if(!filename.startsWith(".")){
+							if(!resources.contains(filepath)) //No siguem repetitius
 							{
 								resources.add(filepath);
 							}
@@ -3,8 +3,8 @@ package com.upc.pbe.upcnews;
 import android.app.Activity;
 import android.os.Bundle;
 import android.util.Log;
-import android.widget.TextView;
+//Menu Help
 public class Help extends Activity{
 	final static String TAG = "Help";
 package com.upc.pbe.upcnews;
+//Excepcio que dona informacio util
 public class InfoException extends Exception
 {
 	private static final long serialVersionUID = 1L;
@@ -16,48 +16,35 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
+//Finestra incial i principal del programa
 public class MainActivity extends Activity implements OnClickListener {
+	
 	private final static String TAG = "Main";
 	private static String html;
 	private ImageButton buttonDescarrega;
 	private TextView URLText;
-
 	@Override
-	public void onCreate(Bundle savedInstanceState) 
-	{
+	public void onCreate(Bundle savedInstanceState){
+		//Creem el layout
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main_activity);
 		Log.d(TAG, "onCreated");
+		//Especifiquem la ruta de descàrrega
 		File tempFolder = new File(((UpcApp)getApplication()).getLocalPath());
 		if(tempFolder.mkdirs())
 		{
 			Log.d(TAG,"Directory " + tempFolder.toString() + " created");
 		}
+		//Creem els botons i text
 		URLText = (TextView) findViewById(R.id.textViewUrl);
 		buttonDescarrega = (ImageButton) findViewById(R.id.button);
 		buttonDescarrega.setOnClickListener(this);
 		updateURL();
 	}
-	public void onResume()
-	{
-		super.onResume();
-		updateURL();
-	}
-	
-	public void updateURL()
-	{
-		URLText.setText(((UpcApp)getApplication()).getUrl());
-	}
-
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.menu, menu);
-		Log.d(TAG, "Menu");
-		return true;
-	}
-
 	public void onClick(View v) {
+		//Al polsar el boto s'inicia la descarrega
 		Log.d(TAG, "onClicked");
 		this.descarregar();
 		if(!html.equals("EMPTY"))
@@ -66,8 +53,10 @@ public class MainActivity extends Activity implements OnClickListener {
 			startActivity(new Intent(this, Directoris.class));
 		}
 	}
-
+	
 	public void descarregar() {
+		//Descarrega del document HTML de la URL especificada
+		//Si hi ha errors, els mostrem en Toasts
 		Descarrega d = new Descarrega();
 		html="EMPTY";
 		try
@@ -83,8 +72,25 @@ public class MainActivity extends Activity implements OnClickListener {
 			Toast.makeText(this, "Can't find URL", Toast.LENGTH_LONG).show();
 		}
 	}
+	
+	public void onResume(){
+		super.onResume();
+		updateURL();
+	}
+	
+	public void updateURL(){
+		URLText.setText(((UpcApp)getApplication()).getUrl());
+	}
+
+	public boolean onCreateOptionsMenu(Menu menu) {
+		//Determina el funcionament al apretar la tecla d'opcions
+		getMenuInflater().inflate(R.menu.menu, menu);
+		Log.d(TAG, "Menu");
+		return true;
+	}
 	public boolean onOptionsItemSelected(MenuItem item) {
+		//Determina el funcionament al clickar en el menu d'opcions
 		switch (item.getItemId()) {
 		case R.id.itemprefs:
 			startActivity(new Intent(this, Prefs.class));
@@ -7,7 +7,7 @@ public class ParentList
 	private String ID;
 	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 boolean Default; //Estos 3 ultimos son para los ext-x-media, los ext-x-stream lo IGNORAN
 	private ArrayList<Video> lists; //per cada qualitat
@@ -71,6 +71,4 @@ public class ParentList
 	{
 		return lists;
 	}
-
-
-}
+}
 \ No newline at end of file
@@ -7,63 +7,51 @@ import java.util.ArrayList;
 import android.app.Activity;
 import android.widget.Toast;
-public class Parser
-{
+//Parser d'arxius m3u8
+public class Parser{
+	
 	private static final String STARTWORD = "#EXTM3U";
-	private String path; // CWD, completes implicit paths such as "file.m3u8"
-							// appending the CWD in order to download the file
-	private int fileType; // indicates if segment list or media list
+	private String path; //CWD, completes implicit paths such as "file.m3u8" appending the CWD in order to download the file
+	private int fileType; //Indica si es segment list o media list
 	private int currentLine;
-	private int currentSegment; // Cada segmento de cada calidad distinta
-	private int currentList; // Indice de cada recurso distinto
+	private int currentSegment; //Cada segment de cada qualitat distinta
+	private int currentList; //Index de cada recurso distint
 	private boolean expectSegment = false;
 	private boolean expectList = false;
 	private Descarrega download;
-	private Activity caller; // Where to send notifications and warnings
-	private boolean validated; // Wether if list starts with #EXTM3U or not
+	private Activity caller; //On enviar les notificacions i warnings
+	private boolean validated; //Indica si la llista comença amb #EXTM3U o no
-	public Parser(String p, Activity caller)
-	{
+	public Parser(String p, Activity caller){
 		this.caller = caller;
 		path = p;
 		currentLine = 0;
 		currentSegment = 0;
 		currentList = 0;
-		fileType = -1;
-		/*
-		 * -1 indicates UNDETERMINED 0 indicates SEGMENTS 1 indicates MEDIA
-		 */
+		fileType = -1;//-1 indica UNDETERMINED, 0 indica SEGMENTS, 1 indica MEDIA
 		download = new Descarrega();
 		validated = false;
 	}
-	public ArrayList<ParentList> parseFile(String file) throws ErrorException, WarningException, InfoException
-	{
+	public ArrayList<ParentList> parseFile(String file) throws ErrorException, WarningException, InfoException {
+		//Parseja un arxiu m3u8
 		ArrayList<ParentList> lists = new ArrayList<ParentList>();
 		lists.add(new ParentList(""));
 		lists.get(0).getLists().add(new Video(-1));
 		String[] lines = file.split("\n");
-		for (int i = 0; i < lines.length; i++)
-		{
-			if (lines[i].endsWith("\\"))
-			{
-				/*
-				 * Merge multiline entries, which are those lines ending with
-				 * backslash.
-				 */
+		for (int i = 0; i < lines.length; i++){
+			if (lines[i].endsWith("\\")){
+				//Barreja les entrades multilinea, que son les que acaben en backslash
 				lines[++i] = lines[i - 1].substring(0, lines[i - 1].indexOf("\\") - 1)
 						+ lines[i];
 			}
-			try
-			{
+			try{
 				parseLine(lines[i], lists);
 			}
-			catch (InfoException iE)
-			{
+			catch (InfoException iE){
 				Toast.makeText(caller, iE.getMessage(), Toast.LENGTH_SHORT).show();
 			}
-			catch (WarningException wE)
-			{
+			catch (WarningException wE){
 				Toast.makeText(caller, wE.getMessage(), Toast.LENGTH_SHORT).show();
 			}
 		}
@@ -73,20 +61,18 @@ public class Parser
 		 * Si no te gusta mis VERSOS,
 		 * te mando a la mierda sin SUTILIDADES.
 		 * 
-		 * -- Imanol, hasta las cejas de cafeÃna.
+		 * -- Imanol, hasta las cejas de cafeina.
 		 * 
-		 * PD: En el Ãºltimo nivel de profundidad hay una lista de segmentos
-		 * (debajo de calidades). AllÃ estÃ¡ el autÃ©ntico tesoro de Narnia.
+		 * PD: En el ultimo nivel de profundidad hay una lista de segmentos
+		 * (debajo de calidades). Alli esta el autentico tesoro de Narnia.
 		 */
-		for (int i = 0; i < lists.size(); i++)
-		{
+		for (int i = 0; i < lists.size(); i++){
 			sortQuality(lists.get(i));
 		}
 		return lists;
 	}
-	private int searchID(String ID, ArrayList<ParentList> lists)
-	{
+	private int searchID(String ID, ArrayList<ParentList> lists){
 		for (int i = 0; i < lists.size(); i++)
 		{
 			if (lists.get(i).getID().equals(ID))
@@ -97,159 +83,110 @@ public class Parser
 		return -1;
 	}
-	private void sortQuality(ParentList ppls)
-	{
+	private void sortQuality(ParentList ppls){
 		ArrayList<Video> lists = ppls.getLists();
-		if (lists.get(0).getQuality() == -1)
-		{
-			/*
-			 * That's the case of Media lists and Segment lists, they don't have
-			 * distinct qualities.
-			 */
+		if (lists.get(0).getQuality() == -1){
+			//Es el cas de Media Lists i Segment Lists, no tenen diferenciacio de qualitats
 			return;
 		}
-		// Bubblesort
-		while (true)
-		{
+		//Bubblesort
+		while (true){
 			boolean sorted = true;
 			int i = 0;
-			do
-			{
-				if (lists.get(i).getQuality() < lists.get(i + 1).getQuality())
-				{
+			do{
+				if (lists.get(i).getQuality() < lists.get(i + 1).getQuality()){
 					sorted = false;
 					Video aux = lists.get(i);
 					lists.set(i, lists.get(i + 1));
 					lists.set(i + 1, aux);
 				}
-			}
-			while (++i != lists.size() - 1);
-			if (sorted)
-			{
+			}while (++i != lists.size() - 1);
+			if (sorted){
 				break;
 			}
 		}
 	}
-	public void parseLine(String line, ArrayList<ParentList> lists) throws ErrorException, WarningException, InfoException
-	{
-		if (line.isEmpty())
-		{
+	public void parseLine(String line, ArrayList<ParentList> lists) throws ErrorException, WarningException, InfoException {
+		//Parseja una linea de l'arxiu
+		if (line.isEmpty()){
 			currentLine++;
 			return;
 		}
-		else
-		{
+		else{
 			ParentList ppls = lists.get(currentList);
 			Video pls = ppls.getLists().get(ppls.getLists().size() - 1);
-			if (!validated)
-			{
-				if (line.equals(STARTWORD))
-				{
+			if (!validated){
+				if (line.equals(STARTWORD)){
 					validated = true;
 				}
-				else
-				{
-					throw new ErrorException("Playlist is not valid");
+				else{
+					throw new ErrorException("Playlist no valida");
 				}
 			}
-			else
-			{
-				if (line.charAt(0) == '#')
-				{
-					if (line.substring(0, 4).equals("#EXT"))
-					{
-						if (expectSegment && !line.startsWith("#EXT-X-BYTERANGE"))
-						{
-							throw new ErrorException("Expected segment URI, got an EXT-TAG instead");
+			else{
+				if (line.charAt(0) == '#'){
+					if (line.substring(0, 4).equals("#EXT")){
+						if (expectSegment && !line.startsWith("#EXT-X-BYTERANGE")){
+							throw new ErrorException("S'esperava segment URI, en comptes tenim EXT-TAG");
 						}
-						if (expectList)
-						{
-							throw new ErrorException("Expected List, got an EXT-TAG instead");
+						if (expectList){
+							throw new ErrorException("S'esperava llista, en comptes tenim EXT-TAG");
 						}
 						String[] extTag = line.split(":", 2);
-						if (extTag[0].equals("#EXT-X-MEDIA-SEQUENCE"))
-						{
+						if (extTag[0].equals("#EXT-X-MEDIA-SEQUENCE")){
 							pls.setSequence(Integer.parseInt(extTag[1]));
 						}
-						else if (extTag[0].equals("#EXT-X-TARGETDURATION"))
-						{
+						else if (extTag[0].equals("#EXT-X-TARGETDURATION")){
 							pls.setMaxDuration(Integer.parseInt(extTag[1]));
 						}
-						else if (extTag[0].equals("#EXTINF"))
-						{
-							if (fileType == -1)
-							{
+						else if (extTag[0].equals("#EXTINF")){
+							if (fileType == -1){
 								fileType = 0;
 							}
-							else if (fileType == 1)
-							{
-								throw new ErrorException("Invalid file, should contain Lists, "
-										+ "but segments were found.");
+							else if (fileType == 1){
+								throw new ErrorException("Arxiu invalid, hauria de contenir llistes pero s'han trobat segments");
 							}
 							String[] args = extTag[1].split(",");
 							float duration = Float.parseFloat(args[0]);
-							if (duration > pls.getMaxDuration())
-							{
-								throw new ErrorException("Segment "
-										+ currentSegment + 1 + " on line "
-										+ currentLine + " exceeds max duration");
+							if (duration > pls.getMaxDuration()){
+								throw new ErrorException("Segment " + currentSegment + 1 + " en linea " + currentLine + " supera la duracio maxima");
 							}
 							Segment s = new Segment(duration);
-							if (args.length == 1)
-							{
+							if (args.length == 1){
 								s.setName("");
 							}
-							else
-							{
+							else{
 								s.setName(args[1]);
 							}
 							pls.getSegments().add(s);
 							expectSegment = true;
 						}
-
-						else if (extTag[0].equals("#EXT-X-STREAM-INF"))
-						{
-							if (fileType == -1)
-							{
+						else if (extTag[0].equals("#EXT-X-STREAM-INF")){
+							if (fileType == -1){
 								fileType = 1;
 							}
-							else if (fileType == 0)
-							{
-								throw new ErrorException("Invalid file, should contain Segments, "
-										+ "but lists were found.");
+							else if (fileType == 0){
+								throw new ErrorException("Arxiu invalid, hauria de contenir segments pero s'han trobat llistes");
 							}
 							expectList = true;
 							String programID = "";
 							double bandwidth = -1;
 							String[] arguments = extTag[1].split(",");
-							for (int i = 0; i < arguments.length; i++)
-							{
+							for (int i = 0; i < arguments.length; i++){
 								String[] argument = arguments[i].split("=");
-								/*
-								 * In case current argument contains several
-								 * values like "val1,val2,val3" detect the "
-								 * character and merge them all in one single
-								 * string
-								 */
-								if (argument[1].startsWith("\"")
-										&& !argument[1].endsWith("\""))
-								{
+								//Si l'argument en questio conte diferents valors, detecta el caracter " i els ajunta en un String
+								if (argument[1].startsWith("\"") && !argument[1].endsWith("\"")){
 									int j = i;
-									while (true)
-									{
-										if (i == arguments.length - 1)
-										{
-											throw new ErrorException("Malformed argument on line "
-													+ currentLine);
+									while (true){
+										if (i == arguments.length - 1){
+											throw new ErrorException("Argument mal expressat en linea " + currentLine);
 										}
-										if (arguments[++i].endsWith("\""))
-										{
+										if (arguments[++i].endsWith("\"")){
 											String end = arguments[i];
-											for (int k = j + 1; k < i; k++)
-											{
+											for (int k = j + 1; k < i; k++){
 												argument[1] += arguments[k];
 											}
 											argument[1] += end;
@@ -257,44 +194,26 @@ public class Parser
 										}
 									}
 								}
-								if (argument[0].equals("PROGRAM-ID"))
-								{
+								if (argument[0].equals("PROGRAM-ID")){
 									programID = argument[1];
 								}
-								else if (argument[0].equals("BANDWIDTH"))
-								{
+								else if (argument[0].equals("BANDWIDTH")){
 									bandwidth = Double.parseDouble(argument[1]);
 								}
 							}
-							if (programID.equals("") || bandwidth == -1)
-							{
-								throw new ErrorException("Playlist on line "
-										+ currentLine
-										+ " has missing arguments");
+							if (programID.equals("") || bandwidth == -1){
+								throw new ErrorException("Playlist en linea " + currentLine + " no te arguments");
 							}
-							if (!programID.equals(ppls.getID()))
-							{
-								/*
-								 * If Program-ID doesn't match, search it or
-								 * create a new one.
-								 */
-								if (ppls.getID().equals(""))
-								{
-									/*
-									 * If working with the default ParentList,
-									 * then modify it, don't create a new one.
-									 */
+							if (!programID.equals(ppls.getID())){
+								//Si el Program-ID no coincideix, buscar o crear un de nou
+								if (ppls.getID().equals("")){
+									//Si es treballa amb la ParentList per defecte, modificar, no crear una nova
 									lists.get(0).setID(programID);
 								}
-								else
-								{
+								else{
 									currentList = searchID(programID, lists);
-									if (currentList == -1)
-									{
-										/*
-										 * ParentList not found, creating a new
-										 * one.
-										 */
+									if (currentList == -1){
+										//No s'ha trobat ParentList, es crea una nova
 										lists.add(new ParentList(programID));
 										currentList = lists.size() - 1;
 									}
@@ -302,35 +221,21 @@ public class Parser
 									pls = ppls.getLists().get(ppls.getLists().size() - 1);
 								}
 							}
-							/*
-							 * Now we create a new List inside the correct
-							 * ParentList.
-							 */
-							if ((ppls.getLists().size() == 1)
-									&& (pls.getQuality() == -1)
-									&& pls.getSegments().isEmpty())
-							{
-								/*
-								 * If working with the default List, then modify
-								 * it, don't create a new one.
-								 */
+							//Creem una List dins el ParentList correcte
+							if ((ppls.getLists().size() == 1) && (pls.getQuality() == -1) && pls.getSegments().isEmpty()){
+								//Si es treballa amb la List per defecte, modificar, no crear una nova
 								pls.setQuality(bandwidth);
 							}
-							else
-							{
+							else{
 								ppls.getLists().add(new Video(bandwidth));
 							}
 						}
-						else if (extTag[0].equals("#EXT-X-MEDIA"))
-						{
-							if (fileType == -1)
-							{
+						else if (extTag[0].equals("#EXT-X-MEDIA")){
+							if (fileType == -1){
 								fileType = 1;
 							}
-							else if (fileType == 0)
-							{
-								throw new ErrorException("Invalid file, should contain Segments, "
-										+ "but lists were found.");
+							else if (fileType == 0){
+								throw new ErrorException("Arxiu invalid, hauria de contenir segments pero s'han trobat llistes");
 							}
 							String Type = "";
 							String Name = "";
@@ -338,31 +243,18 @@ public class Parser
 							String URI = "";
 							boolean Default = false;
 							String[] arguments = extTag[1].split(",");
-							for (int i = 0; i < arguments.length; i++)
-							{
+							for (int i = 0; i < arguments.length; i++){
 								String[] argument = arguments[i].split("=");
-								/*
-								 * In case current argument contains several
-								 * values like "val1,val2,val3" detect the "
-								 * character and merge them all in one single
-								 * string
-								 */
-								if (argument[1].startsWith("\"")
-										&& !argument[1].endsWith("\""))
-								{
+								//Si l'argument en questio conte diferents valors, detecta el caracter " i els ajunta en un String
+								if (argument[1].startsWith("\"") && !argument[1].endsWith("\"")){
 									int j = i;
-									while (true)
-									{
-										if (i == arguments.length - 1)
-										{
-											throw new ErrorException("Malformed argument on line "
-													+ currentLine);
+									while (true){
+										if (i == arguments.length - 1){
+											throw new ErrorException("Argument mal expressat en linea " + currentLine);
 										}
-										if (arguments[++i].endsWith("\""))
-										{
+										if (arguments[++i].endsWith("\"")){
 											String end = arguments[i];
-											for (int k = j + 1; k < i; k++)
-											{
+											for (int k = j + 1; k < i; k++){
 												argument[1] += arguments[k];
 											}
 											argument[1] += end;
@@ -370,82 +262,55 @@ public class Parser
 										}
 									}
 								}
-								if (argument[0].equals("NAME"))
-								{
+								if (argument[0].equals("NAME")){
 									Name = argument[1].substring(1, argument[1].length() - 1);
 								}
-								else if (argument[0].equals("TYPE"))
-								{
+								else if (argument[0].equals("TYPE")){
 									Type = argument[1];
 								}
-								else if (argument[0].equals("GROUP-ID"))
-								{
+								else if (argument[0].equals("GROUP-ID")){
 									GroupID = argument[1].substring(1, argument[1].length() - 1);
 								}
-								else if (argument[0].equals("DEFAULT"))
-								{
-									if (argument[1].equals("YES"))
-									{
+								else if (argument[0].equals("DEFAULT")){
+									if (argument[1].equals("YES")){
 										Default = true;
 									}
-									else if (argument[1].equals("NO"))
-									{
+									else if (argument[1].equals("NO")){
 										Default = true;
 									}
-									else
-									{
-										throw new ErrorException("Invalid value for argument DEFAULT on line "
-												+ currentLine);
+									else{
+										throw new ErrorException("Valor invalid per l'argument DEFAULT en linea " + currentLine);
 									}
 								}
-								else if (argument[0].equals("URI"))
-								{
-									if (!argument[1].contains("http://"))
-									{
-										/*
-										 * In case the path read is RELATIVE
-										 */
-										URI = path
-												+ argument[1].substring(1, argument[1].length() - 1);
+								else if (argument[0].equals("URI")){
+									if (!argument[1].contains("http://")){
+										//En cas de que la ruta llegida es RELATIVE
+										URI = path + argument[1].substring(1, argument[1].length() - 1);
 									}
-									else
-									{
+									else{
 										URI = argument[1].substring(1, argument[1].length() - 1);
 									}
 								}
 							}
-							if (Type.equals("") || Name.equals("")
-									|| URI.equals("") || GroupID.equals(""))
-							{
-								throw new ErrorException("Playlist on line "
-										+ currentLine
-										+ " has missing arguments");
+							if (Type.equals("") || Name.equals("") || URI.equals("") || GroupID.equals("")) {
+								throw new ErrorException("Playlist en linea " + currentLine + " no te arguments");
 							}
 							Parser p = new Parser(URI.substring(0, URI.lastIndexOf("/") + 1), caller);
 							Video newList;
-							try
-							{
+							try{
 								newList = p.parseFile(download.doInBackground(URI)).get(0).getLists().get(0);
-								if (!GroupID.equals(ppls.getID()))
-								{
-									if (ppls.getID().equals(""))
-									{
-										/*
-										 * If working with the default ParentList,
-										 * then modify it, don't create a new one.
-										 */
+								if (!GroupID.equals(ppls.getID())){
+									if (ppls.getID().equals("")){
+										//Si es treballa amb la ParentList per defecte, modificar, no crear una nova
 										ppls.setDefault(Default);
 										ppls.setName(Name);
 										ppls.setType(Type);
 										ppls.getLists().set(0, newList);
 										ppls.setID(GroupID);
 									}
-									else
-									{
-		
+									else{
 										currentList = searchID(GroupID, lists);
-										if (currentList == -1)
-										{
+										if (currentList == -1){
 											ParentList pl = new ParentList(GroupID);
 											pl.setDefault(Default);
 											pl.setName(Name);
@@ -457,92 +322,65 @@ public class Parser
 										ppls.getLists().add(newList);
 									}
 								}
-								else
-								{
+								else{
 									ppls.getLists().add(newList);
 								}
 							}
-							catch (IOException e)
-							{
-								// Nunca llegarÃ¡ aquÃ la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
+							catch (IOException e){
+								// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
 							}
 						}
-
-						else if (extTag[0].equals("#EXT-X-ENDLIST"))
-						{
-							if (expectSegment || expectList)
-							{
-								throw new ErrorException("Unexpected end of list!");
+						else if (extTag[0].equals("#EXT-X-ENDLIST")){
+							if (expectSegment || expectList){
+								throw new ErrorException("Final de llista no esperat!");
 							}
 						}
-
-						else if (extTag[0].equals("#EXT-X-VERSION"))
-						{
-							// IGNORE
+						else if (extTag[0].equals("#EXT-X-VERSION")){
+							//IGNORE
 						}
-
-						else if (extTag[0].equals("#EXT-X-PLAYLIST-TYPE"))
-						{
-							// IGNORE
+						else if (extTag[0].equals("#EXT-X-PLAYLIST-TYPE")){
+							//IGNORE
 						}
-
-						else
-						{
+						else{
 							currentLine++;
-							throw new WarningException("Tag not implemented: "
-									+ extTag[0]);
+							throw new WarningException("Tag no implementat: " + extTag[0]);
 						}
 					}
-					else
-					{
+					else{
 						String comment = line.substring(1);
-						throw new InfoException("Comment on line "
-								+ currentLine++ + " " + comment);
+						throw new InfoException("Comentari en linea " + currentLine++ + " " + comment);
 					}
 				}
-				else
-				{
-					if (expectSegment)
-					{
+				else{
+					if (expectSegment){
 						expectSegment = false;
-						try
-						{
+						try{
 							pls.getSegments().get(currentSegment).setURL(line);
 						}
-						catch (MalformedURLException e)
-						{
+						catch (MalformedURLException e){
 							throw new ErrorException(e.getMessage());
 						}
 						currentSegment++;
 					}
-					else if (expectList)
-					{
-						/*
-						 * Download list and merge the entries with the current
-						 * list
-						 */
+					else if (expectList){
+						//Descarregar llista i juntar les entrades amb les de la llista actual
 						expectList = false;
 						Parser p = new Parser(line.substring(0, line.lastIndexOf("/") + 1), caller);
 						Video newList;
-						try
-						{
+						try{
 							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++)
-							{
+							for (int i = 0; i < newList.getSegments().size(); i++){
 								pls.getSegments().add(newList.getSegments().get(i));
 							}
 						}
-						catch (IOException e)
-						{
-							// Nunca llegarÃ¡ aquÃ la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
+						catch (IOException e){
+							// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
 						}
 					}
-					else
-					{
-						throw new ErrorException("ERROR: Unexpected string "
-								+ line);
+					else{
+						throw new ErrorException("ERROR: String no esperat" + line);
 					}
 				}
 			}
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.util.Log;
+//Menu de preferencies
 public class Prefs extends PreferenceActivity {
 	final static String TAG = "Preferences";
@@ -10,15 +10,14 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
-public class ResourceAdapter extends ArrayAdapter<String>
-{
+//Modificacio de l'Adapter d'Adnroid, creat al nostre gust per donar estil als elements de la ListView de directoris i arxius
+public class ResourceAdapter extends ArrayAdapter<String> {
     Context context; 
     int layoutResourceId;    
     String[] entries = null;
-    public ResourceAdapter(Context context, int layoutResourceId, String[] data) 
-    {
+    public ResourceAdapter(Context context, int layoutResourceId, String[] data) {
         super(context, layoutResourceId, data);
         this.layoutResourceId = layoutResourceId;
         this.context = context;
@@ -26,29 +25,24 @@ public class ResourceAdapter extends ArrayAdapter&lt;String&gt;
     }
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) 
-    {
+    public View getView(int position, View convertView, ViewGroup parent) {
     	 TextView row;
-         if (convertView == null) 
-         {
+         if (convertView == null) {
         	 LayoutInflater inflater = ((Activity)context).getLayoutInflater();
              row = (TextView) inflater.inflate(R.layout.rowlayout, parent, false);
          } 
-         else 
-         {
+         else {
              row = (TextView) convertView;
          }
-
          final String text = entries[position];
          row.setText(text);
-	     if(text.endsWith(".m3u8")) //Playlists
-	     {
-	       	//row.setTypeface(null, Typeface.BOLD);
+         //Si es un m3u8, posem el text en verd
+	     if(text.endsWith(".m3u8")) {
 	       	row.setTextColor(Color.parseColor("#5FB404"));
 	     }
-	     else //Normal entries
-	     {
+	     //Si no, posem el text en blau
+	     else{
 	    	 row.setTypeface(null,Typeface.NORMAL);
 	    	 row.setTextColor(((Activity)context).getResources().getColor(R.color.BlueAndroid));
 	     }
@@ -3,39 +3,33 @@ package com.upc.pbe.upcnews;
 import java.net.MalformedURLException;
 import java.net.URL;
-public class Segment
-{
+public class Segment {
+	
 	private String name;
 	private float duration;
 	private URL url;
-	public Segment(float dur)
-	{
+	public Segment(float dur) {
 		name = "";
 		duration = dur;
 	}
-	public void setName(String nam)
-	{
+	public void setName(String nam) {
 		name = nam;
 	}
-	public String getName()
-	{
+	public String getName() {
 		return name;
 	}
-	public float getDuration()
-	{
+	public float getDuration() {
 		return duration;
 	}
-	public void setURL(String url) throws MalformedURLException
-	{
+	public void setURL(String url) throws MalformedURLException {
 		this.url = new URL(url);
 	}
-	public String getURL()
-	{
+	public String getURL() {
 		return url.toString();
 	}
 }
@@ -2,53 +2,43 @@ package com.upc.pbe.upcnews;
 import java.util.ArrayList;
-public class Video
-{
+public class Video {
-	private double quality;
+	private double quality; //Indica la qualitat
 	private int sequenceFirst;
 	private int maxDuration;
 	private ArrayList<Segment> segments; //Lista de SEGMENTOS
-	public Video(double q)
-	{
+	public Video(double q){
 		quality = q;
 		segments = new ArrayList<Segment>();
 	}
-	public void setSequence(int seq)
-	{
+	public void setSequence(int seq){
 		sequenceFirst = seq;
 	}
-	public int getSequence()
-	{
+	public int getSequence(){
 		return sequenceFirst;
 	}
-	public void setMaxDuration(int dur)
-	{
+	public void setMaxDuration(int dur){
 		maxDuration = dur;
 	}
-	public int getMaxDuration()
-	{
+	public int getMaxDuration(){
 		return maxDuration;
 	}
-	public double getQuality()
-	{
+	public double getQuality(){
 		return quality;
 	}
-	public void setQuality(double q)
-	{
+	public void setQuality(double q){
 		quality = q;
 	}
-	public ArrayList<Segment> getSegments()
-	{
+	public ArrayList<Segment> getSegments(){
 		return segments;
 	}
-}
-
+}
 \ No newline at end of file
 package com.upc.pbe.upcnews;
+//Excepcio que indica error no critic, hi ha un error pero es pot continuar amb l'execucio
 public class WarningException extends Exception
 {
 	private static final long serialVersionUID = 1L;