Commit e2790528cc952f39c385b69342cb45ef1ff9e31a

Authored by Imanol-Mikel Barba Sabariego
1 parent 6a63e004

O.o'

src/com/upc/pbe/upcnews/Directoris.java
@@ -65,7 +65,7 @@ public class Directoris extends Activity implements OnItemClickListener { @@ -65,7 +65,7 @@ public class Directoris extends Activity implements OnItemClickListener {
65 public void onItemClick(AdapterView<?> parent, View view, int position, long id) { 65 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
66 //Determina el funcionament al clickar en una de les entrades de al ListView 66 //Determina el funcionament al clickar en una de les entrades de al ListView
67 String path = ((TextView)view).getText().toString(); 67 String path = ((TextView)view).getText().toString();
68 - //Si es un m3u8, el descarrega, parseja i inicia la reproducció 68 + //Si es un m3u8, el descarrega, parseja i inicia la reproducci�
69 if(path.endsWith(".m3u8")){ 69 if(path.endsWith(".m3u8")){
70 path = currentFolder + path; 70 path = currentFolder + path;
71 String playlist; 71 String playlist;
@@ -89,7 +89,7 @@ public class Directoris extends Activity implements OnItemClickListener { @@ -89,7 +89,7 @@ public class Directoris extends Activity implements OnItemClickListener {
89 * startPlayer(segment[0],segment[1]); 89 * startPlayer(segment[0],segment[1]);
90 */ 90 */
91 String[] test = {"/sdcard/a.ts","LE TEST"}; 91 String[] test = {"/sdcard/a.ts","LE TEST"};
92 - startPlayer(test[0],test[1]); 92 + startActivity(new Intent(this, VideoActivity.class));
93 93
94 } 94 }
95 catch (ErrorException e){ 95 catch (ErrorException e){
@@ -121,15 +121,6 @@ public class Directoris extends Activity implements OnItemClickListener { @@ -121,15 +121,6 @@ public class Directoris extends Activity implements OnItemClickListener {
121 showResources(); 121 showResources();
122 } 122 }
123 } 123 }
124 -  
125 - private void startPlayer(String url, String title) {  
126 - Intent i = new Intent();  
127 - i.setComponent(new ComponentName("me.abitno.vplayer.t", "me.abitno.vplayer.VideoActivity"));  
128 - i.setAction("me.abitno.vplayer.action.VIEW");  
129 - i.setData(Uri.parse(url));  
130 - i.putExtra("displayName", title);  
131 - startActivity(i);  
132 - }  
133 124
134 public boolean onKeyDown(int keyCode, KeyEvent event) { 125 public boolean onKeyDown(int keyCode, KeyEvent event) {
135 //Determina el funcionament al apretar la tecla de tornar enrere 126 //Determina el funcionament al apretar la tecla de tornar enrere
src/com/upc/pbe/upcnews/VideoActivity.java
@@ -17,7 +17,7 @@ public class VideoActivity extends Activity { @@ -17,7 +17,7 @@ public class VideoActivity extends Activity {
17 public void onCreate(Bundle savedInstanceState) { 17 public void onCreate(Bundle savedInstanceState) {
18 super.onCreate(savedInstanceState); 18 super.onCreate(savedInstanceState);
19 setContentView(R.layout.activity_video); 19 setContentView(R.layout.activity_video);
20 - url = "http://imanolbarba.myftp.biz/video.mp4"; 20 + url = "http://imanolbarba.myftp.biz/a.ts";
21 // url = ((UpcApp) getApplication()).getDesc(); 21 // url = ((UpcApp) getApplication()).getDesc();
22 22
23 23