Imanol-Mikel Barba Sabariego / upcnews · Commits

Commit 347148fc507b3f8e3a5f4b476699bbc931133659

Authored by Imanol-Mikel Barba Sabariego
1 parent c89d05ed

--no commit message

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
src/com/upc/pbe/upcnews/Directoris.java
  View file @347148f
... ... @@ -118,7 +118,7 @@ public class Directoris extends Activity implements OnClickListener {
118 118 String m3u8 = d.doInBackground(urlvideo);
119 119 Log.d(TAG, m3u8);
120 120 Parser p = new Parser();
121   -
  121 + /*
122 122 try {
123 123 ArrayList<ParentList> m3u8parsed = p.parseFile(m3u8);
124 124  
... ... @@ -132,12 +132,13 @@ public class Directoris extends Activity implements OnClickListener {
132 132 } catch (InfoException e) {
133 133 Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
134 134 Log.d(TAG, e.getMessage());
135   - }
  135 + }*/
136 136 }
137 137  
138 138 //VideoPlayer
139 139 String urlvid = null;
140 140 ((UpcApp) getApplication()).setDesc(urlvid);
  141 +
141 142 startActivity(new Intent(this, VideoActivity.class));
142 143 }
143 144 }
144 145 \ No newline at end of file
... ...
src/com/upc/pbe/upcnews/VideoActivity.java
  View file @347148f
... ... @@ -16,7 +16,8 @@ public class VideoActivity extends Activity {
16 16 public void onCreate(Bundle savedInstanceState) {
17 17 super.onCreate(savedInstanceState);
18 18 setContentView(R.layout.activity_video);
19   - url = ((UpcApp) getApplication()).getDesc();
  19 + url = "http://imanolbarba.myftp.biz/video.mp4";
  20 + //url = ((UpcApp) getApplication()).getDesc();
20 21  
21 22 //Creacio del VideoPlayer associat a una URL
22 23 video = (VideoView) findViewById(R.id.videoView1);
... ...