From 347148fc507b3f8e3a5f4b476699bbc931133659 Mon Sep 17 00:00:00 2001 From: Equip de Desenvolupadors de PBE Date: Wed, 5 Dec 2012 14:31:42 +0000 Subject: [PATCH] --- src/com/upc/pbe/upcnews/Directoris.java | 5 +++-- src/com/upc/pbe/upcnews/VideoActivity.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/upc/pbe/upcnews/Directoris.java b/src/com/upc/pbe/upcnews/Directoris.java index 8f31686..3c4c424 100644 --- a/src/com/upc/pbe/upcnews/Directoris.java +++ b/src/com/upc/pbe/upcnews/Directoris.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 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 diff --git a/src/com/upc/pbe/upcnews/VideoActivity.java b/src/com/upc/pbe/upcnews/VideoActivity.java index f5cbe61..8512bd3 100644 --- a/src/com/upc/pbe/upcnews/VideoActivity.java +++ b/src/com/upc/pbe/upcnews/VideoActivity.java @@ -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); -- libgit2 0.22.2