--no commit message

Imanol-Mikel Barba Sabariego
1 parent c89d05ed
Showing 2 changed files with 5 additions and 3 deletions
src/com/upc/pbe/upcnews/Directoris.java
src/com/upc/pbe/upcnews/VideoActivity.java
@@ -118,7 +118,7 @@ public class Directoris extends Activity implements OnClickListener {
 			String m3u8 = d.doInBackground(urlvideo);
 			Log.d(TAG, m3u8);
 			Parser p = new Parser();
-			
+			/*
 			try {
 				ArrayList<ParentList> m3u8parsed = p.parseFile(m3u8);
@@ -132,12 +132,13 @@ public class Directoris extends Activity implements OnClickListener {
 			} catch (InfoException e) {
 				Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
 				Log.d(TAG, e.getMessage());
-			}
+			}*/
 		}
 		//VideoPlayer
 		String urlvid = null;
 		((UpcApp) getApplication()).setDesc(urlvid);
+		
 		startActivity(new Intent(this, VideoActivity.class));
 	}
 }
 \ No newline at end of file
@@ -16,7 +16,8 @@ public class VideoActivity extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_video);
-        url = ((UpcApp) getApplication()).getDesc();
+        url = "http://imanolbarba.myftp.biz/video.mp4";
+       //url = ((UpcApp) getApplication()).getDesc();
         //Creacio del VideoPlayer associat a una URL
         video = (VideoView) findViewById(R.id.videoView1);