source: smplayer/trunk/src/videopreview/async.diff

videopreview/main.cpp

@@ -47 +47 @@
         */
         //vp.setAspectRatio( 2.35 );
 
+
+
+
+
+
+
         if ( (vp.showConfigDialog()) && (vp.createThumbnails()) ) {
                 vp.show();
                 vp.adjustWindowSize();
                 return a.exec();
         }
-
+#endif
         return 0;
 }

videopreview/videopreview.cpp

@@ -105 +105 @@
         my_layout->addWidget(button_box);
         setLayout(my_layout);
 
+
+
+
+
 
+
+
+
+
         QList<QByteArray> r_formats = QImageReader::supportedImageFormats();
         QString read_formats;
         for (int n=0; n < r_formats.count(); n++) {
@@ -156 +164 @@
                 return "00000005.jpg";
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 bool VideoPreview::createThumbnails() {
         clearThumbnails();
         error_message.clear();
@@ -244 +378 @@
 
         return true;
 }
+
 
 bool VideoPreview::runMplayer(int seek) {
         QStringList args;
@@ -283 +418 @@
         for (int n = 0; n < args.count(); n++) command = command + args[n] + " ";
         qDebug("VideoPreview::runMplayer: command: %s", command.toUtf8().constData());
 
+
+
+
+
+
+
+
+
+
+
+
+
         QProcess p;
         #ifdef CD_TO_TEMP_DIR
         p.setWorkingDirectory(full_output_dir);
@@ -294 +441 @@
                 error_message = tr("The mplayer process didn't run");
                 return false;
         }
+
 
         return true;
 }

videopreview/videopreview.h

@@ -19 +19 @@
 #ifndef _VIDEOPREVIEW_H_
 #define _VIDEOPREVIEW_H_
 
+
+
 #include <QWidget>
 #include <QString>
 #include <QList>
 
+
+
+
+
 class QProgressDialog;
 class QGridLayout;
 class QLabel;
@@ -90 +96 @@
         void setExtractFormat( ExtractFormat format ) { prop.extract_format = format; };
         ExtractFormat extractFormat() { return prop.extract_format; };
 
+
+
+
         bool createThumbnails();
+
 
         bool showConfigDialog();
 
@@ -106 +116 @@
         void cancelPressed();
         void saveImage();
 
+
+
+
+
+
 protected:
+
+
+
+
+
+
+
+
+
         bool extractImages();
+
         bool runMplayer(int seek);
         bool addPicture(const QString & filename, int num, int time); 
         void displayVideoInfo(const VideoInfo & i);
@@ -144 +169 @@
                 ExtractFormat extract_format;
         } prop;
 
+
         struct {
                 int thumbnail_width;
+
+
+
+
         } run;
+
+
+
+
+
 
         QString last_directory;
         QString error_message;

basegui.cpp

@@ -4022 +4022 @@
 
         video_preview->setMplayerPath(pref->mplayer_bin);
 
+
+
+
+
+
         if ( (video_preview->showConfigDialog()) && (video_preview->createThumbnails()) ) {
                 video_preview->show();
                 video_preview->adjustWindowSize();
         }
+
 }
 
 QNetworkProxy BaseGui::userProxy() {