Changeset 143 for trunk

Timestamp:

02/15/07 16:10:15 (5 years ago)

Author:

jlee

Message:

Generic sort-of extendable progress dialog and prevent infinite loops on mplayer commands

Location:

trunk/src/org/thestaticvoid/iriverter

Files:

• Converter.java (modified) (1 diff)
• ConverterUI.java (modified) (2 diffs)
• DVD.java (modified) (2 diffs)
• DVDInfoReader.java (modified) (1 diff)
• DVDProgressDialog.java (modified) (1 diff)
• GenericProgressDialog.java (added)
• MPlayerInfo.java (modified) (1 diff)
• ManualSplit.java (modified) (1 diff)

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

@@ -320 +320 @@
                 progressDialogInfo.setStatus("Gathering information about the input video...");
                 
-                MPlayerInfo info = new MPlayerInfo("dvd://" + dvdInfo.getTitle(), dvdInfo.getDrive());
+                MPlayerInfo info = new MPlayerInfo("dvd://" + dvdInfo.getTitle(), dvdInfo.getDrive(), ConverterOptions.getMPlayerPath());
                 
                 List commandList = prepareBaseCommandList("dvd://" + dvdInfo.getTitle(), dvdInfo.getOutputVideo(), info);

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

@@ -394 +394 @@
                                         progressDialog.open();
                                         converter.cancel();
+                                        
+                                        canceled = true;
                                 } catch (MPlayerNotFoundException mpe) {
                                         canceled = new MPlayerPathDialog(shell, SWT.NONE).open();
@@ -407 +409 @@
         
                         if (file != null) {
-                                try {
-                                        proc = Runtime.getRuntime().exec(new String[]{MPlayerInfo.getMPlayerPath() + "mplayer", file});
-                                } catch (IOException io) {
-                                        io.printStackTrace();
-                                } catch (MPlayerNotFoundException mpe) {
-                                        MPlayerPathDialog dialog = new MPlayerPathDialog(shell, SWT.NONE);
-                                        dialog.open();
-                                }
+                                boolean canceled = false;
+                                while (!canceled)
+                                        try {
+                                                proc = Runtime.getRuntime().exec(new String[]{MPlayerInfo.getMPlayerPath() + "mplayer", file});
+                                                canceled = true;
+                                        } catch (IOException io) {
+                                                io.printStackTrace();
+                                                canceled = true;
+                                        } catch (MPlayerNotFoundException mpe) {
+                                                canceled = new MPlayerPathDialog(shell, SWT.NONE).open();
+                                        }
                         }
                 }

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

@@ -244 +244 @@
                                                 
                                                 proc = Runtime.getRuntime().exec(command);
+                                                
+                                                canceled = true;
                                         } catch (IOException io) {
                                                 io.printStackTrace();
@@ -338 +340 @@
 
                                 setLanguageCombos();
+                                
+                                canceled = true;
                         } catch (MPlayerNotFoundException mpe) {
                                 canceled = new MPlayerPathDialog(getParent().getShell(), SWT.NONE).open();

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

@@ -40 +40 @@
         public void run() {
                 int numberOfTitles = new MPlayerInfo("dvd://", drive, mplayerPath).getNumberOfTitles();
-                progressDialog.setNumberOfTitles(numberOfTitles);
+                progressDialog.setMaximum(numberOfTitles);
                 
                 for (int i = 1; i <= numberOfTitles; i++) {
-                        progressDialog.setCurrentTitle(i);
+                        progressDialog.setCurrent(i);
                         MPlayerInfo rawTitleInfo = new MPlayerInfo("dvd://" + i, drive, mplayerPath);
                         

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

@@ -22 +22 @@
 package org.thestaticvoid.iriverter;
 
-import org.eclipse.swt.*;
 import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.graphics.*;
 
-public class DVDProgressDialog extends Dialog {
-        private Shell shell;
-        private int style, syncNumberOfTitles, syncCurrentTitle;
-        private Label header, status;
-        private ProgressBar progressBar;
-        
-        public DVDProgressDialog(Shell shell, int style) {
-                super(shell, style);
+public class DVDProgressDialog extends GenericProgressDialog {
+        public DVDProgressDialog(Shell parent, int style) {
+                super(parent, style, "Gathering Information About DVD");
         }
         
-        public void open() {            
-                shell = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-                shell.setText("Gathering Information About DVD");
-                GridLayout gridLayout = new GridLayout();
-                gridLayout.horizontalSpacing = 6;
-                gridLayout.verticalSpacing = 6;
-                gridLayout.marginHeight = 12;
-                gridLayout.marginWidth = 12;
-                shell.setLayout(gridLayout);
+        public String getStatusText() {
+                if (getMaximum() == 0)
+                        return "Getting how many titles are on the DVD";
                 
-                header = new Label(shell, SWT.NONE);
-                header.setText("Gathering Information About DVD");
-                FontData[] fontData = header.getFont().getFontData();
-                fontData[0].setStyle(SWT.BOLD);
-                fontData[0].setHeight(fontData[0].getHeight() + 4);
-                header.setFont(new Font(Display.getDefault(), fontData));
-                
-                progressBar = new ProgressBar(shell, SWT.HORIZONTAL | SWT.SMOOTH);
-                progressBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-                
-                status = new Label(shell, SWT.NONE);
-                status.setText("Getting how many titles are on the DVD");
-                fontData = status.getFont().getFontData();
-                fontData[0].setStyle(SWT.ITALIC);
-                status.setFont(new Font(getParent().getDisplay(), fontData));
-                
-                shell.pack();
-                shell.setSize(400, shell.getSize().y);
-                
-                shell.open();
-                while (!shell.isDisposed())
-                        if (!getParent().getDisplay().readAndDispatch())
-                                getParent().getDisplay().sleep();
-        }
-        
-        public synchronized void close() {
-                Display.getDefault().syncExec(new Runnable() {
-                        public void run() {
-                                shell.dispose();
-                        }
-                });
-        }
-        
-        public synchronized void setNumberOfTitles(int numberOfTitles) {
-                syncNumberOfTitles = numberOfTitles;
-        
-                Display.getDefault().syncExec(new Runnable() {
-                        public void run() {
-                                progressBar.setMaximum(syncNumberOfTitles);
-                        }
-                });
-        }
-        
-        public synchronized void setCurrentTitle(int currentTitle) {
-                syncCurrentTitle = currentTitle;
-                
-                Display.getDefault().syncExec(new Runnable() {
-                        public void run() {
-                                progressBar.setSelection(syncCurrentTitle);
-                                status.setText("Reading title " + syncCurrentTitle + " of " + syncNumberOfTitles);
-                                status.pack();
-                        }
-                });
+                return "Reading title " + getCurrent() + " of " + getMaximum();
         }
 }

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

@@ -42 +42 @@
                 String[] command = null;
                 if (dvdDrive != null)
-                        command = new String[]{mplayerPath + "mplayer", "-vo", "null", "-ao", "null", "-frames", "1", "-dvd-device", dvdDrive, video.toString(), "-v", "-identify"};
+                        command = new String[]{mplayerPath + File.separator + "mplayer", "-vo", "null", "-ao", "null", "-frames", "1", "-dvd-device", dvdDrive, video.toString(), "-v", "-identify"};
                 else
-                        command = new String[]{mplayerPath + "mplayer", "-vo", "null", "-ao", "null", "-frames", "1", video.toString(), "-identify"};
+                        command = new String[]{mplayerPath + File.separator + "mplayer", "-vo", "null", "-ao", "null", "-frames", "1", video.toString(), "-identify"};
                 
                 String commandStr = "";

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

@@ -187 +187 @@
                                                 sec.setText("00");
                                                 marksList.removeAll();
+                                                
+                                                canceled = true;
                                         } catch (MPlayerNotFoundException mpe) {
                                                 canceled = new MPlayerPathDialog(getParent().getShell(), SWT.NONE).open();