meta-opendreambox: stop using PR
[opendreambox.git] / meta-opendreambox / recipes-multimedia / projectx / projectx / dreambox-headless.patch
1 diff -Naur Project-X-org/src/edu/stanford/ejalbert/BrowserLauncher.java Project-X/src/edu/stanford/ejalbert/BrowserLauncher.java
2 --- Project-X-org/src/edu/stanford/ejalbert/BrowserLauncher.java        2004-10-30 01:31:13.000000000 +0200
3 +++ Project-X/src/edu/stanford/ejalbert/BrowserLauncher.java    2010-02-17 22:31:06.000000000 +0100
4 @@ -251,6 +251,7 @@
5          *                      <code>false</code> if any portion of the initialization failed
6          */
7         private static boolean loadClasses() {
8 +/*
9                 switch (jvm) {
10                         case MRJ_2_0:
11                                 try {
12 @@ -350,6 +351,7 @@
13                                 break;
14                         default:
15                             break;
16 +*/
17                 }
18                 return true;
19         }
20 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/common/Common.java Project-X/src/net/sourceforge/dvb/projectx/common/Common.java
21 --- Project-X-org/src/net/sourceforge/dvb/projectx/common/Common.java   2010-01-31 15:19:58.000000000 +0100
22 +++ Project-X/src/net/sourceforge/dvb/projectx/common/Common.java       2010-02-18 12:42:31.000000000 +0100
23 @@ -70,7 +70,6 @@
24  
25  import net.sourceforge.dvb.projectx.xinput.XInputFile;
26  import net.sourceforge.dvb.projectx.xinput.XInputDirectory;
27 -import net.sourceforge.dvb.projectx.xinput.topfield_raw.RawInterface;
28  import net.sourceforge.dvb.projectx.xinput.DirType;
29  
30  import net.sourceforge.dvb.projectx.net.WebInterface;
31 @@ -81,8 +80,8 @@
32  public final class Common extends Object {
33  
34         /* main version index */
35 -       private static String version_name = "ProjectX 0.90.4.00.b32";
36 -       private static String version_date = "23.08.2009";
37 +       private static String version_name = "ProjectX 0.90.4.00.b32.Dreambox";
38 +       private static String version_date = "31.01.2010";
39  
40         private static String line_separator = System.getProperty("line.separator");
41  
42 @@ -234,10 +233,9 @@
43         public static void init()
44         {
45                 StatusString = Resource.getString("run.status");
46 -
47                 scan = new Scan();
48 -               subpicture = new Subpicture();
49 -               teletext = new Teletext();
50 +//             subpicture = new Subpicture();
51 +//             teletext = new Teletext();
52                 mpvdecoder = new MpvDecoder();
53                 subpicture_colormodels = loadColorModels();
54         }
55 @@ -288,8 +286,8 @@
56                 guiInterface = new GuiInterface(showGUI);
57  
58                 //load gui
59 -               if (showGUI())
60 -                       getGuiInterface().loadGui();
61 +//             if (showGUI())
62 +//                     getGuiInterface().loadGui();
63         }
64  
65         /**
66 @@ -677,16 +675,16 @@
67          */
68         public static String checkLibraryAccess()
69         {
70 -               try {
71 -                       Class cls = Class.forName("org.apache.commons.net.ftp.FTPClient");
72 -
73 -                       canAccessFtp = true;
74 -
75 -                       return null;
76 -               }
77 -               catch (Exception exc) {}
78 -               catch (Error err) {}
79 -
80 +//             try {
81 +//                     Class cls = Class.forName("org.apache.commons.net.ftp.FTPClient");
82 +//
83 +//                     canAccessFtp = true;
84 +//
85 +//                     return null;
86 +//             }
87 +//             catch (Exception exc) {}
88 +//             catch (Error err) {}
89 +//
90                 return "\ncommons-net library not accessible! see readme.txt [ii]\nensure the correct location/classpath, related to the executed .jar\n";
91         }
92  
93 @@ -1414,7 +1412,7 @@
94         {
95                 List list = new ArrayList();
96  
97 -               list.add("Java Environment");
98 +/*             list.add("Java Environment");
99                 list.add(getDateAndTime());
100                 list.add(Resource.getString("javaev.java.version") + "\t" + System.getProperty("java.version"));
101                 list.add(Resource.getString("javaev.java.vendor") + "\t" + System.getProperty("java.vendor"));
102 @@ -1441,7 +1439,7 @@
103                 list.add(Resource.getString("javaev.java.user.lang") + "\t" + Resource.getChosenLanguage());
104                 list.add(Resource.getString("javaev.java.user.name") + "\t" + System.getProperty("user.name"));
105                 list.add(Resource.getString("javaev.java.user.home") + "\t" + System.getProperty("user.home"));
106 -
107 +*/
108                 return list.toArray();
109         }
110  
111 @@ -1533,7 +1531,9 @@
112  
113                 ProcessedPercent = percent;
114  
115 -               getGuiInterface().updateProgressBar(ProcessedPercent);
116 +               System.out.println("[PROGRESS] " + ProcessedPercent);
117 +
118 +//             getGuiInterface().updateProgressBar(ProcessedPercent);
119         }
120  
121         /**
122 @@ -1544,7 +1544,8 @@
123         public static void updateProgressBar(String str)
124         {
125                 setStatusString(str);
126 -               getGuiInterface().updateProgressBar(str);
127 +               System.out.println("[PROGRESS] " + str);
128 +//             getGuiInterface().updateProgressBar(str);
129         }
130  
131         /**
132 @@ -1690,7 +1691,7 @@
133  
134                 try {
135                         // Get input files from topfield raw disk access
136 -                       XInputDirectory xInputDirectory = new XInputDirectory(DirType.RAW_DIR);
137 +/*                     XInputDirectory xInputDirectory = new XInputDirectory(DirType.RAW_DIR);
138                         XInputFile[] addlist = xInputDirectory.getFiles();
139  
140                         // Sort them
141 @@ -1710,7 +1711,7 @@
142                         // Add them to the list
143                         for (int b = 0; b < addlist.length; b++)
144                                 arraylist.add(addlist[b]);
145 -
146 +*/
147                 } catch (Throwable t) {
148                         // Assume no dll available or no hd or no file, so do nothing!
149                 }
150 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/common/GuiInterface.java Project-X/src/net/sourceforge/dvb/projectx/common/GuiInterface.java
151 --- Project-X-org/src/net/sourceforge/dvb/projectx/common/GuiInterface.java     2008-09-28 12:03:24.000000000 +0200
152 +++ Project-X/src/net/sourceforge/dvb/projectx/common/GuiInterface.java 2010-02-17 22:28:19.000000000 +0100
153 @@ -51,18 +51,18 @@
154          */
155         private void getImplementation(boolean loadGUI)
156         {
157 -               try {
158 -                       if (loadGUI)
159 -                       {
160 -                               impl = (GuiInterfaceIF) Class.forName("net.sourceforge.dvb.projectx.gui.GuiInterfaceImpl").newInstance();
161 -                               accessible = true;
162 -                       }
163 -
164 -               } catch (Exception e) {
165 -                       //System.out.println(e.toString());
166 -                       Common.setExceptionMessage(e);
167 -                       // no gui class found
168 -               }
169 +//             try {
170 +//                     if (loadGUI)
171 +//                     {
172 +//                             impl = (GuiInterfaceIF) Class.forName("net.sourceforge.dvb.projectx.gui.GuiInterfaceImpl").newInstance();
173 +//                             accessible = true;
174 +//                     }
175 +
176 +//             } catch (Exception e) {
177 +//                     //System.out.println(e.toString());
178 +//                     Common.setExceptionMessage(e);
179 +//                     // no gui class found
180 +//             }
181         }
182  
183         /**
184 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/common/Start.java Project-X/src/net/sourceforge/dvb/projectx/common/Start.java
185 --- Project-X-org/src/net/sourceforge/dvb/projectx/common/Start.java    2010-01-31 15:19:58.000000000 +0100
186 +++ Project-X/src/net/sourceforge/dvb/projectx/common/Start.java        2010-02-18 12:39:34.000000000 +0100
187 @@ -255,11 +255,12 @@
188                         /**
189                          * planned to disable ftp only, if commons-net is missing
190                          */
191 -                       if ((str = Common.checkLibraryAccess()) != null)
192 +/*                     if ((str = Common.checkLibraryAccess()) != null)
193                         {
194                                 throw new Exception(str);
195                                 //System.out.println(ret);
196                         }
197 +*/
198  
199                         System.out.println("Loading AC3 frames...");
200  
201 @@ -300,10 +301,7 @@
202  
203                         else
204                         {
205 -                               if (!Common.getGuiInterface().isAvailable())
206 -                                       System.out.println("Stopped! Can't start GUI, Classes not available...");
207 -
208 -                               else if (!Common.isCollectionListEmpty())
209 +                               if (!Common.isCollectionListEmpty())
210                                 {
211                                         Common.getGuiInterface().addCollectionAtEnd();
212                                         Common.getGuiInterface().showActiveCollection(0);
213 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/parser/MainProcess.java Project-X/src/net/sourceforge/dvb/projectx/parser/MainProcess.java
214 --- Project-X-org/src/net/sourceforge/dvb/projectx/parser/MainProcess.java      2009-03-03 11:46:58.000000000 +0100
215 +++ Project-X/src/net/sourceforge/dvb/projectx/parser/MainProcess.java  2010-02-17 22:27:03.000000000 +0100
216 @@ -1162,9 +1162,9 @@
217  
218                 job_processing.setSplitSize(splitsize);
219  
220 -               try {
221 -                       Toolkit.getDefaultToolkit().beep();
222 -               } catch (Exception e) {}
223 +//             try {
224 +//                     Toolkit.getDefaultToolkit().beep();
225 +//             } catch (Exception e) {}
226  
227         }
228  
229 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java Project-X/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java
230 --- Project-X-org/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java        2009-03-22 11:49:08.000000000 +0100
231 +++ Project-X/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java    2010-02-17 22:27:03.000000000 +0100
232 @@ -72,8 +72,8 @@
233  
234  public class MpvDecoder extends Object {
235  
236 -       private IDCTRefNative idct;
237 -       private IDCTSseNative idctsse;
238 +//     private IDCTRefNative idct;
239 +//     private IDCTSseNative idctsse;
240  
241         private int preview_horizontal_size = 512;
242         private int preview_vertical_size = 288;
243 @@ -134,14 +134,14 @@
244         {
245                 Arrays.fill(pixels2, 0xFF505050);
246  
247 -               idct = new IDCTRefNative();
248 -               idctsse = new IDCTSseNative();
249 +//             idct = new IDCTRefNative();
250 +//             idctsse = new IDCTSseNative();
251  
252 -               if (IDCTRefNative.isLibraryLoaded())
253 -                       idct.init();
254 +//             if (IDCTRefNative.isLibraryLoaded())
255 +//                     idct.init();
256  
257 -               if (IDCTRefNative.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
258 -                       acceleration = true;
259 +//             if (IDCTRefNative.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
260 +//                     acceleration = true;
261         }
262  
263         /**
264 @@ -184,35 +184,35 @@
265  private int ERROR_CODE1=0;
266  
267  /* extension start code IDs */
268 -final int SEQUENCE_EXTENSION_ID=1;
269 -final int SEQUENCE_DISPLAY_EXTENSION_ID=2;
270 -final int QUANT_MATRIX_EXTENSION_ID=3;
271 -final int COPYRIGHT_EXTENSION_ID=4;
272 -final int PICTURE_DISPLAY_EXTENSION_ID=7;
273 -final int PICTURE_CODING_EXTENSION_ID=8;
274 -final int ZIG_ZAG=0;
275 -final int MB_WEIGHT=32;
276 -final int MB_CLASS4=64;
277 -final int MC_FIELD=1;
278 -final int MC_FRAME=2;
279 -final int MC_16X8=2;
280 -final int MC_DMV=3;
281 -final int MV_FIELD=0;
282 -final int MV_FRAME=1;
283 -final int I_TYPE=1;
284 -final int P_TYPE=2;
285 -final int B_TYPE=3;
286 -final int TOP_FIELD=1;
287 -final int BOTTOM_FIELD=2;
288 -final int FRAME_PICTURE=3;
289 -final int MACROBLOCK_INTRA=1;
290 -final int MACROBLOCK_PATTERN=2;
291 -final int MACROBLOCK_MOTION_BACKWARD=4;
292 -final int MACROBLOCK_MOTION_FORWARD=8;
293 -final int MACROBLOCK_QUANT=16;
294 -final int CHROMA420=1;
295 -final int CHROMA422=2;
296 -final int CHROMA444=3;
297 +final byte SEQUENCE_EXTENSION_ID=1;
298 +final byte SEQUENCE_DISPLAY_EXTENSION_ID=2;
299 +final byte QUANT_MATRIX_EXTENSION_ID=3;
300 +final byte COPYRIGHT_EXTENSION_ID=4;
301 +final byte PICTURE_DISPLAY_EXTENSION_ID=7;
302 +final byte PICTURE_CODING_EXTENSION_ID=8;
303 +final byte ZIG_ZAG=0;
304 +final byte MB_WEIGHT=32;
305 +final byte MB_CLASS4=64;
306 +final byte MC_FIELD=1;
307 +final byte MC_FRAME=2;
308 +final byte MC_16X8=2;
309 +final byte MC_DMV=3;
310 +final byte MV_FIELD=0;
311 +final byte MV_FRAME=1;
312 +final byte I_TYPE=1;
313 +final byte P_TYPE=2;
314 +final byte B_TYPE=3;
315 +final byte TOP_FIELD=1;
316 +final byte BOTTOM_FIELD=2;
317 +final byte FRAME_PICTURE=3;
318 +final byte MACROBLOCK_INTRA=1;
319 +final byte MACROBLOCK_PATTERN=2;
320 +final byte MACROBLOCK_MOTION_BACKWARD=4;
321 +final byte MACROBLOCK_MOTION_FORWARD=8;
322 +final byte MACROBLOCK_QUANT=16;
323 +final byte CHROMA420=1;
324 +final byte CHROMA422=2;
325 +final byte CHROMA444=3;
326  final int IDCT_CLIP_TABLE_OFFSET=512;
327  
328  private int q_scale_type=0;  //1
329 @@ -790,18 +790,18 @@
330         {-1,0},
331         {MACROBLOCK_MOTION_FORWARD,3},
332         {MACROBLOCK_PATTERN,2}, {MACROBLOCK_PATTERN,2},
333 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,1}, 
334 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,1},
335 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,1}, 
336 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,1}
337 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),1}, 
338 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),1},
339 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),1}, 
340 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),1}
341  };
342  
343  /* Table B-3, macroblock_type in P-pictures, codes 000001..00011x */
344  final byte PMBtab1[][] = {
345         {-1,0},
346 -       {MACROBLOCK_QUANT|MACROBLOCK_INTRA,6},
347 -       {MACROBLOCK_QUANT|MACROBLOCK_PATTERN,5}, {MACROBLOCK_QUANT|MACROBLOCK_PATTERN,5},
348 -       {MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,5}, {MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,5},
349 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_INTRA),6},
350 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_PATTERN),5}, {(byte)(MACROBLOCK_QUANT|MACROBLOCK_PATTERN),5},
351 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),5}, {(byte)(MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),5},
352         {MACROBLOCK_INTRA,5}, {MACROBLOCK_INTRA,5}
353  };
354  
355 @@ -809,32 +809,32 @@
356  final byte BMBtab0[][] = {
357         {-1,0}, 
358         {-1,0},
359 -       {MACROBLOCK_MOTION_FORWARD,4},
360 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,4},
361 -       {MACROBLOCK_MOTION_BACKWARD,3}, 
362 -       {MACROBLOCK_MOTION_BACKWARD,3},
363 -       {MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,3}, 
364 -       {MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,3},
365 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD,2}, 
366 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD,2},
367 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD,2}, 
368 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD,2},
369 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,2},
370 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,2},
371 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,2},
372 -       {MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,2}
373 +       {(byte)(MACROBLOCK_MOTION_FORWARD),4},
374 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),4},
375 +       {(byte)(MACROBLOCK_MOTION_BACKWARD),3}, 
376 +       {(byte)(MACROBLOCK_MOTION_BACKWARD),3},
377 +       {(byte)(MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),3}, 
378 +       {(byte)(MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),3},
379 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD),2}, 
380 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD),2},
381 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD),2}, 
382 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD),2},
383 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),2},
384 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),2},
385 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),2},
386 +       {(byte)(MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),2}
387  };
388  
389  /* Table B-4, macroblock_type in B-pictures, codes 000001..00011x */
390  final byte BMBtab1[][] = {
391         {-1,0},
392 -       {MACROBLOCK_QUANT|MACROBLOCK_INTRA,6},
393 -       {MACROBLOCK_QUANT|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,6},
394 -       {MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN,6},
395 -       {MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,5},
396 -       {MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN,5},
397 -       {MACROBLOCK_INTRA,5}, 
398 -       {MACROBLOCK_INTRA,5}
399 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_INTRA),6},
400 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),6},
401 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_PATTERN),6},
402 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),5},
403 +       {(byte)(MACROBLOCK_QUANT|MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD|MACROBLOCK_PATTERN),5},
404 +       {(byte)(MACROBLOCK_INTRA),5}, 
405 +       {(byte)(MACROBLOCK_INTRA),5}
406  };
407  
408  final double frame_rate_Table[] = {
409 @@ -2308,33 +2308,33 @@
410                 //form_predictions(bx, by, macroblock_type, motion_type, PMV, motion_vertical_field_select, dmvector);
411  
412  
413 -       if (IDCTSseNative.isLibraryLoaded() && isAccelerated())
414 -       {
415 -               /* copy or add block data into picture */
416 -               for (comp=0; comp<block_count; comp++)
417 -               {
418 -                       /* ISO/IEC 13818-2 section Annex A: inverse DCT */
419 -                       idctsse.referenceIDCT(block[comp]);
420 -
421 -                       /* ISO/IEC 13818-2 section 7.6.8: Adding prediction and coefficient data */
422 -                       Add_Block(comp, bx, by, dct_type, (macroblock_type[0] & MACROBLOCK_INTRA)==0);
423 -               }
424 -       }
425 -
426 -       else if (IDCTRefNative.isLibraryLoaded() && isAccelerated())
427 -       {
428 -               /* copy or add block data into picture */
429 -               for (comp=0; comp<block_count; comp++)
430 -               {
431 -                       /* ISO/IEC 13818-2 section Annex A: inverse DCT */
432 -                       idct.referenceIDCT(block[comp]);
433 -
434 -                       /* ISO/IEC 13818-2 section 7.6.8: Adding prediction and coefficient data */
435 -                       Add_Block(comp, bx, by, dct_type, (macroblock_type[0] & MACROBLOCK_INTRA)==0);
436 -               }
437 -       }
438 -
439 -       else
440 +//     if (IDCTSseNative.isLibraryLoaded() && isAccelerated())
441 +//     {
442 +//             /* copy or add block data into picture */
443 +//             for (comp=0; comp<block_count; comp++)
444 +//             {
445 +//                     /* ISO/IEC 13818-2 section Annex A: inverse DCT */
446 +//                     idctsse.referenceIDCT(block[comp]);
447 +// 
448 +//                     /* ISO/IEC 13818-2 section 7.6.8: Adding prediction and coefficient data */
449 +//                     Add_Block(comp, bx, by, dct_type, (macroblock_type[0] & MACROBLOCK_INTRA)==0);
450 +//             }
451 +//     }
452 +// 
453 +//     else if (IDCTRefNative.isLibraryLoaded() && isAccelerated())
454 +//     {
455 +//             /* copy or add block data into picture */
456 +//             for (comp=0; comp<block_count; comp++)
457 +//             {
458 +//                     /* ISO/IEC 13818-2 section Annex A: inverse DCT */
459 +//                     idct.referenceIDCT(block[comp]);
460 +// 
461 +//                     /* ISO/IEC 13818-2 section 7.6.8: Adding prediction and coefficient data */
462 +//                     Add_Block(comp, bx, by, dct_type, (macroblock_type[0] & MACROBLOCK_INTRA)==0);
463 +//             }
464 +//     }
465 +//
466 +//     else
467         {
468                 /* copy or add block data into picture */
469                 for (comp=0; comp<block_count; comp++)
470 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/xinput/DirType.java Project-X/src/net/sourceforge/dvb/projectx/xinput/DirType.java
471 --- Project-X-org/src/net/sourceforge/dvb/projectx/xinput/DirType.java  2005-12-17 21:47:40.000000000 +0100
472 +++ Project-X/src/net/sourceforge/dvb/projectx/xinput/DirType.java      2010-02-17 22:37:48.000000000 +0100
473 @@ -45,14 +45,14 @@
474         /**
475          * Directory on a ftp server
476          */
477 -       public final static DirType FTP_DIR = new DirType(1, "FTP_DIR",
478 -                       net.sourceforge.dvb.projectx.xinput.ftp.XInputDirectoryImpl.class);
479 +//     public final static DirType FTP_DIR = new DirType(1, "FTP_DIR",
480 +//                     net.sourceforge.dvb.projectx.xinput.ftp.XInputDirectoryImpl.class);
481  
482         /**
483          * Directory on a harddisk of a topfield receiver in raw format
484          */
485 -       public final static DirType RAW_DIR = new DirType(2, "RAW_DIR",
486 -                       net.sourceforge.dvb.projectx.xinput.topfield_raw.XInputDirectoryImpl.class);
487 +//     public final static DirType RAW_DIR = new DirType(2, "RAW_DIR",
488 +//                     net.sourceforge.dvb.projectx.xinput.topfield_raw.XInputDirectoryImpl.class);
489  
490         /**
491          * Default DirType
492 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/xinput/FileType.java Project-X/src/net/sourceforge/dvb/projectx/xinput/FileType.java
493 --- Project-X-org/src/net/sourceforge/dvb/projectx/xinput/FileType.java 2005-12-17 21:47:40.000000000 +0100
494 +++ Project-X/src/net/sourceforge/dvb/projectx/xinput/FileType.java     2010-02-17 22:38:01.000000000 +0100
495 @@ -45,14 +45,14 @@
496         /**
497          * File on a ftp server
498          */
499 -       public final static FileType FTP = new FileType(1, "FTP",
500 -                       net.sourceforge.dvb.projectx.xinput.ftp.XInputFileImpl.class);
501 +//     public final static FileType FTP = new FileType(1, "FTP",
502 +//                     net.sourceforge.dvb.projectx.xinput.ftp.XInputFileImpl.class);
503  
504         /**
505          * File on a harddisk of a topfield receiver in raw format
506          */
507 -       public final static FileType RAW = new FileType(2, "RAW",
508 -                       net.sourceforge.dvb.projectx.xinput.topfield_raw.XInputFileImpl.class);
509 +//     public final static FileType RAW = new FileType(2, "RAW",
510 +//                     net.sourceforge.dvb.projectx.xinput.topfield_raw.XInputFileImpl.class);
511  
512         /**
513          * Default FileType
514 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/xinput/XInputStream.java Project-X/src/net/sourceforge/dvb/projectx/xinput/XInputStream.java
515 --- Project-X-org/src/net/sourceforge/dvb/projectx/xinput/XInputStream.java     2006-03-28 20:44:30.000000000 +0200
516 +++ Project-X/src/net/sourceforge/dvb/projectx/xinput/XInputStream.java 2010-02-17 22:51:56.000000000 +0100
517 @@ -31,7 +31,7 @@
518  import java.io.InputStream;
519  import java.io.BufferedInputStream;
520  
521 -import net.sourceforge.dvb.projectx.xinput.ftp.XInputFileImpl;
522 +//import net.sourceforge.dvb.projectx.xinput.ftp.XInputFileImpl;
523  
524  import net.sourceforge.dvb.projectx.common.Common;
525  import net.sourceforge.dvb.projectx.common.Keys;
526 @@ -42,7 +42,7 @@
527  
528         private byte[] buffer = new byte[1];
529  
530 -       private XInputFileImpl xInputFile = null;
531 +//     private XInputFileImpl xInputFile = null;
532  
533         /**
534          * Create stream, which is able to handle special needs of the xinput package.
535 @@ -55,9 +55,9 @@
536                 super(Common.getSettings().getBooleanProperty(Keys.KEY_additionalInputBuffer) ? new BufferedInputStream(aIs, 1048576) : aIs);
537         }
538  
539 -       public void setFtpFile(XInputFileImpl aIf) {
540 -               xInputFile = aIf;
541 -       }
542 +//     public void setFtpFile(XInputFileImpl aIf) {
543 +//             xInputFile = aIf;
544 +//     }
545  
546         /**
547          * Takes care, that always the full amount of data is read (if possible).
548 @@ -143,11 +143,11 @@
549         public final void close() throws IOException {
550                 if (debug) System.out.println("Enter XInputStream.close()");
551  
552 -               if (xInputFile != null)
553 -               {
554 -                       xInputFile.randomAccessClose();
555 -                       xInputFile = null;
556 -               }
557 +//             if (xInputFile != null)
558 +//             {
559 +//                     xInputFile.randomAccessClose();
560 +//                     xInputFile = null;
561 +//             }
562  
563                 super.close();
564                 if (debug) System.out.println("Leave XInputStream.close()");
565 diff -Naur Project-X-org/src/net/sourceforge/dvb/projectx/xinput/topfield_raw/RawInterface.java Project-X/src/net/sourceforge/dvb/projectx/xinput/topfield_raw/RawInterface.java
566 --- Project-X-org/src/net/sourceforge/dvb/projectx/xinput/topfield_raw/RawInterface.java        2005-12-17 21:47:40.000000000 +0100
567 +++ Project-X/src/net/sourceforge/dvb/projectx/xinput/topfield_raw/RawInterface.java    2010-02-17 22:29:12.000000000 +0100
568 @@ -41,14 +41,14 @@
569         String sourcefile;
570  
571         public RawInterface(String aSourceFile) {
572 -               try {
573 -                       Class rawReadClass = Class.forName("RawRead");
574 -                       rawRead = (RawReadIF) rawReadClass.newInstance();
575 -                       sourcefile = aSourceFile;
576 -                       stream_size = 0;
577 -               } catch (Exception e) {
578 -                       throw new IllegalArgumentException("Can't instantiate RawInterface");
579 -               }
580 +//             try {
581 +//                     Class rawReadClass = Class.forName("RawRead");
582 +//                     rawRead = (RawReadIF) rawReadClass.newInstance();
583 +//                     sourcefile = aSourceFile;
584 +//                     stream_size = 0;
585 +//             } catch (Exception e) {
586 +//                     throw new IllegalArgumentException("Can't instantiate RawInterface");
587 +//             }
588         }
589  
590         public final void add_native_files(ArrayList arraylist) {