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

Timestamp:

04/14/07 20:11:39 (5 years ago)

Author:

jlee

Message:

JoinVideos? made modular using ConcatenateShit? class. Now everything compiles successfully. There are still a lot of things left to do before useable again:

• Reimplement DVD in SingleVideo? (=> automatic Matroska/OGM support thanks to KuwaiiRiver?'s code)
• Add error detection in all Jobs
• Close ProgressDialog? when done with Jobs and show errors if any

Things I want to do before 18:

• Implement 2-passes option in SingleVideo? Job/MencoderCommand? (should be incredibly easy)
• Add GUI profile management (Ticket #12)

Yes...I'm happy with the way things are going. 18 will almost be the way this program should have always been.

File:

• trunk/src/org/thestaticvoid/iriverter/ConverterUI.java (modified) (1 diff)

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

@@ -768 +768 @@
         }
         
-        private JoinVideos newJoinVideos() {
+        private void newJoinVideos() {
                 CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-                JoinVideos joinVideos = new JoinVideos(tabFolder, SWT.NONE, tabItem);
-                tabItem.setControl(joinVideos);
-                tabFolder.setSelection(tabItem);
-                tabChanged(false);
-                
-                return joinVideos;
+                JoinVideos joinVideos = null;
+                
+                boolean canceled = false;
+                while (!canceled)
+                        try {
+                                joinVideos = new JoinVideos(tabFolder, SWT.NONE, tabItem, MPlayerInfo.getMPlayerPath()); 
+                                tabItem.setControl(joinVideos);
+                                tabFolder.setSelection(tabItem);
+                                tabChanged(false);
+                                canceled = true;
+                        } catch (MPlayerNotFoundException mpe) {
+                                canceled = new MPlayerPathDialog(shell).open();
+                        } catch (Exception e) {
+                                tabItem.dispose();
+                                canceled = true;
+                        }
         }