Changeset 161 for trunk/src/org/thestaticvoid/iriverter/ConverterUI.java

Timestamp:

04/14/07 15:52:46 (5 years ago)

Author:

jlee

Message:

Add code from David Grundberg's KuwaiiRiver?; preparation to combine DVD and SingleVideo? code; improvements to the shitty stuff (more modular conversion code)

File:

• trunk/src/org/thestaticvoid/iriverter/ConverterUI.java (modified) (5 diffs)

trunk/src/org/thestaticvoid/iriverter/ConverterUI.java

@@ -414 +414 @@
                                 while (!canceled)
                                         try {
-                                                Runtime.getRuntime().exec(new String[]{MPlayerInfo.getMPlayerPath() + MPlayerInfo.MPLAYER_BIN, file});
+                                                Process proc = Runtime.getRuntime().exec(new String[]{MPlayerInfo.getMPlayerPath() + MPlayerInfo.MPLAYER_BIN, file});
+                                                BlackHole.suck(proc.getInputStream());
+                                                BlackHole.suck(proc.getInputStream());
                                                 canceled = true;
                                         } catch (IOException io) {
@@ -438 +440 @@
                         newDirectory();
                 
-                if (e.getSource() == newDVD || e.getSource() == newDVDTool)
-                        newDVD();
+                /*if (e.getSource() == newDVD || e.getSource() == newDVDTool)
+                        newDVD();*/
                 
                 if (e.getSource() == manualSplit)
@@ -684 +686 @@
                                 while (!canceled)
                                         try {
-                                                singleVideo = new SingleVideo(tabFolder, SWT.NONE, tabItem, video, MPlayerInfo.getMPlayerPath()); 
+                                                singleVideo = new SingleVideo(tabFolder, SWT.NONE, tabItem, new InputVideo(video), MPlayerInfo.getMPlayerPath()); 
                                                 tabItem.setControl(singleVideo);
                                                 tabFolder.setSelection(tabItem);
@@ -718 +720 @@
         }
         
-        private DVD newDVD() {
+        /*private DVD newDVD() {
                 DVD lastDVD = null;
                 for (int i = tabFolder.getItemCount() - 1; i >= 0 && lastDVD == null; i--)
@@ -737 +739 @@
                 
                 return dvd;
-        }
+        }*/
         
         private ManualSplit newManualSplit() {