Movie import

app/src/actioncommands.cpp

@@ -121,7 +121,17 @@ Status ActionCommands::importSound()
         return Status::SAFE;
     }
 
-    Status st = mEditor->sound()->loadSound(key, strSoundFile);
+    Status st = Status::FAIL;
+
+    if (strSoundFile.endsWith(".wav"))
+    {
+        st = mEditor->sound()->loadSound(key, strSoundFile);
+    }
+    else
+    {
+        QProgressDialog dummyDialog;
+        st = mEditor->importMovieAudio(strSoundFile, dummyDialog) ? Status::OK : Status::FAIL;
+    }
 
     if (!st.ok())
     {

app/src/filedialogex.cpp

@@ -184,7 +184,7 @@ QString FileDialog::openFileFilters( FileType fileType )
         case FileType::IMAGE: return PFF_IMAGE_FILTER;
         case FileType::IMAGE_SEQUENCE: return PFF_IMAGE_SEQ_FILTER;
         case FileType::GIF: return PFF_GIF_EXT_FILTER;
-        case FileType::MOVIE: { Q_ASSERT(false); return PFF_MOVIE_EXT; } // currently not supported
+        case FileType::MOVIE: return PFF_MOVIE_EXT;
         case FileType::SOUND: return PFF_SOUND_EXT_FILTER;
         case FileType::PALETTE: return PFF_PALETTE_EXT_FILTER;
     }

app/src/mainwindow2.cpp

@@ -253,10 +253,12 @@ void MainWindow2::createMenus()
     connect(ui->actionImport_ImageSeq, &QAction::triggered, this, &MainWindow2::importImageSequence);
     connect(ui->actionImport_ImageSeqNum, &QAction::triggered, this, &MainWindow2::importPredefinedImageSet);
     connect(ui->actionImportLayers_from_pclx, &QAction::triggered, this, &MainWindow2::importLayers);
+    connect(ui->actionImport_MovieVideo, &QAction::triggered, this, &MainWindow2::importMovieVideo);
     connect(ui->actionImport_Gif, &QAction::triggered, this, &MainWindow2::importGIF);
-    connect(ui->actionImport_Movie, &QAction::triggered, this, &MainWindow2::importMovie);
 
     connect(ui->actionImport_Sound, &QAction::triggered, mCommands, &ActionCommands::importSound);
+    connect(ui->actionImport_MovieAudio, &QAction::triggered, this, &MainWindow2::importMovieAudio);
+
     connect(ui->actionImport_Append_Palette, &QAction::triggered, this, &MainWindow2::importPalette);
     connect(ui->actionImport_Replace_Palette, &QAction::triggered, this, &MainWindow2::openPalette);
 
@@ -364,7 +366,7 @@ void MainWindow2::createMenus()
         mColorBox->toggleViewAction(),
         mColorPalette->toggleViewAction(),
         mTimeLine->toggleViewAction(),
-        mDisplayOptionWidget->toggleViewAction(),        
+        mDisplayOptionWidget->toggleViewAction(),
         mColorInspector->toggleViewAction(),
         mOnionSkinWidget->toggleViewAction()
     };
@@ -727,6 +729,8 @@ bool MainWindow2::saveObject(QString strSavedFileName)
     mEditor->object()->setFilePath(strSavedFileName);
     mEditor->object()->setModified(false);
 
+    mEditor->clearTemporary();
+
     QSettings settings(PENCIL2D, PENCIL2D);
     settings.setValue(LAST_PCLX_PATH, strSavedFileName);
 
@@ -970,15 +974,74 @@ void MainWindow2::importGIF()
     mIsImportingImageSequence = false;
 }
 
-void MainWindow2::importMovie()
+void MainWindow2::importMovieVideo()
 {
     FileDialog fileDialog(this);
     QString filePath = fileDialog.openFile(FileType::MOVIE);
     if (filePath.isEmpty())
     {
         return;
     }
-    mEditor->importMovie(filePath, mEditor->playback()->fps());
+
+    // Flag this so we don't prompt the user about auto-save in the middle of the import.
+    mIsImportingImageSequence = true;
+
+    // Show a progress dialog, as this can take a while if you have lots of images.
+    QProgressDialog progress(tr("Importing movie video..."), tr("Abort"), 0, 100, this);
+    hideQuestionMark(progress);
+    progress.setWindowModality(Qt::WindowModal);
+    progress.show();
+
+    bool ok = mEditor->importMovieVideo(filePath, mEditor->playback()->fps(), progress);
+
+    if (!ok)
+    {
+        QMessageBox::warning(this,
+                             tr("Warning"),
+                             tr("was unable to import") + filePath,
+                             QMessageBox::Ok,
+                             QMessageBox::Ok);
+    }
+
+    mEditor->layers()->notifyAnimationLengthChanged();
+
+    progress.setValue(100);
+    progress.close();
+
+    mIsImportingImageSequence = false;
+}
+
+void MainWindow2::importMovieAudio()
+{
+    FileDialog fileDialog(this);
+    QString filePath = fileDialog.openFile(FileType::MOVIE);
+    if (filePath.isEmpty())
+    {
+        return;
+    }
+
+    // Show a progress dialog. The progress isn't actually tracked, but this will allow the operation to be cancelled
+    QProgressDialog progress(tr("Importing movie video..."), tr("Abort"), 0, 100, this);
+    hideQuestionMark(progress);
+    progress.setWindowModality(Qt::WindowModal);
+    progress.setValue(0);
+    progress.show();
+
+    bool ok = mEditor->importMovieAudio(filePath, progress);
+
+    if (!ok)
+    {
+        QMessageBox::warning(this,
+                             tr("Warning"),
+                             tr("was unable to import") + filePath,
+                             QMessageBox::Ok,
+                             QMessageBox::Ok);
+    }
+
+    mEditor->layers()->notifyAnimationLengthChanged();
+
+    progress.setValue(100);
+    progress.close();
 }
 
 void MainWindow2::lockWidgets(bool shouldLock)
@@ -992,7 +1055,7 @@ void MainWindow2::lockWidgets(bool shouldLock)
     mOnionSkinWidget->setFeatures(feat);
     mToolOptions->setFeatures(feat);
     mToolBox->setFeatures(feat);
-    mTimeLine->setFeatures(feat);    
+    mTimeLine->setFeatures(feat);
 }
 
 void MainWindow2::preferences()
@@ -1041,7 +1104,7 @@ bool MainWindow2::newObject()
 
 bool MainWindow2::newObjectFromPresets(int presetIndex)
 {
-    Object* object = nullptr;   
+    Object* object = nullptr;
     QString presetFilePath = (presetIndex > 0) ? PresetDialog::getPresetPath(presetIndex) : "";
     if (!presetFilePath.isEmpty())
     {
@@ -1122,7 +1185,8 @@ void MainWindow2::setupKeyboardShortcuts()
 
     ui->actionImport_Image->setShortcut(cmdKeySeq(CMD_IMPORT_IMAGE));
     ui->actionImport_ImageSeq->setShortcut(cmdKeySeq(CMD_IMPORT_IMAGE_SEQ));
-    ui->actionImport_Movie->setShortcut(cmdKeySeq(CMD_IMPORT_MOVIE));
+    ui->actionImport_MovieVideo->setShortcut(cmdKeySeq(CMD_IMPORT_MOVIE_VIDEO));
+    ui->actionImport_MovieAudio->setShortcut(cmdKeySeq(CMD_IMPORT_MOVIE_AUDIO));
     ui->actionImport_Append_Palette->setShortcut(cmdKeySeq(CMD_IMPORT_PALETTE));
     ui->actionImport_Sound->setShortcut(cmdKeySeq(CMD_IMPORT_SOUND));
 
@@ -1218,7 +1282,7 @@ void MainWindow2::setupKeyboardShortcuts()
     mColorBox->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_COLOR_WHEEL));
     mColorPalette->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_COLOR_LIBRARY));
     mTimeLine->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_TIMELINE));
-    mDisplayOptionWidget->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_DISPLAY_OPTIONS));    
+    mDisplayOptionWidget->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_DISPLAY_OPTIONS));
     mColorInspector->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_COLOR_INSPECTOR));
     mOnionSkinWidget->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_ONION_SKIN));
 

app/src/mainwindow2.h

@@ -82,10 +82,13 @@ public slots:
     // import
     void importImage();
     void importImageSequence();
+    void importImageSequenceNumbered();
+    void addLayerByFilename(QString strFilePath);
     void importPredefinedImageSet();
     void importLayers();
-    void importMovie();
+    void importMovieVideo();
     void importGIF();
+    void importMovieAudio();
 
     void lockWidgets(bool shouldLock);
 

app/ui/mainwindow2.ui

@@ -63,11 +63,13 @@
      <addaction name="separator"/>
      <addaction name="actionImport_Image"/>
      <addaction name="actionImport_ImageSeq"/>
-     <addaction name="actionImport_Movie"/>
      <addaction name="actionImport_ImageSeqNum"/>
+     <addaction name="actionImport_MovieVideo"/>
      <addaction name="actionImport_Gif"/>
      <addaction name="actionImportLayers_from_pclx"/>
+     <addaction name="separator"/>
      <addaction name="actionImport_Sound"/>
+     <addaction name="actionImport_MovieAudio"/>
      <addaction name="separator"/>
      <addaction name="actionImport_Replace_Palette"/>
      <addaction name="actionImport_Append_Palette"/>
@@ -348,12 +350,9 @@
     <string>Image Sequence...</string>
    </property>
   </action>
-  <action name="actionImport_Movie">
+  <action name="actionImport_MovieVideo">
    <property name="text">
-    <string>Movie...</string>
-   </property>
-   <property name="visible">
-    <bool>false</bool>
+    <string>Movie Video...</string>
    </property>
   </action>
   <action name="actionImport_Sound">
@@ -1015,6 +1014,16 @@
     <string>Peg bar Alignment</string>
    </property>
   </action>
+  <action name="actionImport_MovieVideo">
+   <property name="text">
+    <string>Movie Video...</string>
+   </property>
+  </action>
+  <action name="actionImport_MovieAudio">
+   <property name="text">
+    <string>Movie Audio...</string>
+    </property>
+  </action>
   <action name="actionImport_Append_Palette">
    <property name="text">
     <string>Append to Palette...</string>

core_lib/src/external/linux/linux.cpp

@@ -61,67 +61,3 @@ void initialise()
     foreach (QString format, formats)
     {qDebug() << "QImageWriter capability: " << format;}
 }
-
-void Editor::importMovie (QString filePath, int fps)
-{
-
-    int i;
-    QSettings settings( PENCIL2D, PENCIL2D );
-
-    qDebug() << "-------IMPORT VIDEO------" << filePath;
-
-    // --------- Import all the temporary frames ----------
-    QDir::temp().mkdir("pencil");
-    QString tempPath = QDir::temp().absolutePath()+"/pencil/";
-
-    QProgressDialog progress("Importing movie...", "Abort", 0, 100, NULL);
-    progress.setWindowModality(Qt::WindowModal);
-    progress.show();
-    progress.setValue(10);
-    QProcess ffmpeg;
-    qDebug() << "ffmpeg -i \"" << filePath << "\" -r " << QString::number(fps) << " -f image2 \"" << tempPath << "tmp_import%4d.png\"";
-    ffmpeg.start("ffmpeg -i \"" + filePath + "\" -r " + QString::number(fps) + " -f image2 \"" + tempPath + "tmp_import%4d.png\"");
-    progress.setValue(20);
-    if (ffmpeg.waitForStarted() == true)
-    {
-        if (ffmpeg.waitForFinished() == true)
-        {
-            QByteArray sErr = ffmpeg.readAllStandardError();
-            if (sErr == "")
-            {qDebug() << "ERROR: Could not execute FFmpeg.";}
-            else
-            {
-                qDebug() << "stderr: " + ffmpeg.readAllStandardOutput();
-                qDebug() << "stdout: " << sErr;
-            }
-        }
-        else
-        {qDebug() << "ERROR: FFmpeg did not finish executing.";}
-    }
-    else
-    {qDebug() << "Please install FFMPEG: sudo apt-get install ffmpeg";}
-    progress.setValue(50);
-    QDir dir1(tempPath);
-    int nFiles = dir1.entryList().count();
-    i=1;
-    QString frameNumberString = QString::number(i);
-    while( frameNumberString.length() < 4) frameNumberString.prepend("0");
-    while (QFile::exists(tempPath+"tmp_import"+frameNumberString+".png"))
-    {
-        progress.setValue(50+i*50/nFiles);
-        if(i>1) scrubForward();
-        importImage(tempPath+"tmp_import"+frameNumberString+".png");
-        i++;
-        frameNumberString = QString::number(i);
-        while( frameNumberString.length() < 4) frameNumberString.prepend("0");
-    }
-    progress.setValue(100);
-    // --------- Clean up temp directory ---------
-    QDir dir(tempPath);
-    QStringList filtername("*.*");
-    QStringList entries = dir.entryList(filtername,QDir::Files,QDir::Type);
-    for(int i=0; i<entries.size(); i++)
-        dir.remove(entries[i]);
-
-}
-

core_lib/src/external/macosx/macosx.cpp

@@ -83,68 +83,4 @@ void enableCoalescing()
     //MacOSXNative::setMouseCoalescingEnabled(true);
 }
 
-void Editor::importMovie(QString filePath, int fps)
-{
-
-    int i;
-    QSettings settings( PENCIL2D , PENCIL2D );
-
-    qDebug() << "-------IMPORT VIDEO------" << filePath;
-
-    // --------- Import all the temporary frames ----------
-    QDir::temp().mkdir("pencil");
-    QString tempPath = QDir::temp().absolutePath()+"/pencil/";
-
-    QProgressDialog progress("Importing movie...", "Abort", 0, 100, NULL);
-    progress.setWindowModality(Qt::WindowModal);
-    progress.show();
-    progress.setValue(10);
-    QProcess ffmpeg;
-    qDebug() << "ffmpeg -i \"" << filePath << "\" -r " << QString::number(fps) << " -f image2 \"" << tempPath << "tmp_import%4d.png\"";
-    ffmpeg.start("ffmpeg -i \"" + filePath + "\" -r " + QString::number(fps) + " -f image2 \"" + tempPath + "tmp_import%4d.png\"");
-    progress.setValue(20);
-    if (ffmpeg.waitForStarted() == true)
-    {
-        if (ffmpeg.waitForFinished() == true)
-        {
-            QByteArray sErr = ffmpeg.readAllStandardError();
-            if (sErr == "")
-            {qDebug() << "ERROR: Could not execute FFmpeg.";}
-            else
-            {
-                qDebug() << "stderr: " + ffmpeg.readAllStandardOutput();
-                qDebug() << "stdout: " << sErr;
-            }
-        }
-        else
-        {qDebug() << "ERROR: FFmpeg did not finish executing.";}
-    }
-    else
-    {
-        qDebug() << "Please install FFMPEG: sudo apt-get install ffmpeg";
-    }
-    progress.setValue(50);
-    QDir dir1(tempPath);
-    int nFiles = dir1.entryList().count();
-    i=1;
-    QString frameNumberString = QString::number(i);
-    while( frameNumberString.length() < 4) frameNumberString.prepend("0");
-    while (QFile::exists(tempPath+"tmp_import"+frameNumberString+".png"))
-    {
-        progress.setValue(50+i*50/nFiles);
-        if(i>1) scrubForward();
-        importImage(tempPath+"tmp_import"+frameNumberString+".png");
-        i++;
-        frameNumberString = QString::number(i);
-        while( frameNumberString.length() < 4) frameNumberString.prepend("0");
-    }
-    progress.setValue(100);
-    // --------- Clean up temp directory ---------
-    QDir dir(tempPath);
-    QStringList filtername("*.*");
-    QStringList entries = dir.entryList(filtername,QDir::Files,QDir::Type);
-    for(int i=0; i<entries.size(); i++)
-        dir.remove(entries[i]);
-}
-
 } // extern "C"