rework android-rmt display, add a few buttons

[goodguy/history.git] / cinelerra-5.0 / cinelerra / record.C

diff --git a/cinelerra-5.0/cinelerra/record.C b/cinelerra-5.0/cinelerra/record.C
index 933e7ef04e71f1e54eaa0829421eb57ab3e7861b..c4c6f4b5cb0a4803141cf208dd4c09a8b2b2e384 100644 (file)
--- a/cinelerra-5.0/cinelerra/record.C
+++ b/cinelerra-5.0/cinelerra/record.C
@@ -39,7 +39,6 @@
 #include "errorbox.h"
 #include "file.h"
 #include "filexml.h"
-#include "filemov.h"
 #include "filesystem.h"
 #include "filethread.h"
 #include "format.inc"
@@ -48,6 +47,8 @@
 #include "keys.h"
 #include "language.h"
 #include "localsession.h"
+#include "libdv.h"
+#include "libmjpeg.h"
 #include "mainmenu.h"
 #include "mainundo.h"
 #include "mwindow.h"
@@ -56,7 +57,6 @@
 #include "picture.h"
 #include "playbackengine.h"
 #include "preferences.h"
-#include "quicktime.h"
 #include "record.h"
 #include "recordaudio.h"
 #include "recordconfig.h"
@@ -200,23 +200,25 @@ int Record::load_defaults()
        default_asset->layers = 1;
 // Fix encoding parameters depending on driver.
 // These are locked by a specific driver.
+       const char *vcodec = 0;
        switch( session->vconfig_in->driver ) {
        case CAPTURE_LML:
        case CAPTURE_BUZ:
-               strncpy(default_asset->vcodec, QUICKTIME_MJPA, 4);
+               vcodec = CODEC_TAG_MJPEG;
                break;
        case CAPTURE_DVB:
        case VIDEO4LINUX2MPEG:
                break;
        case VIDEO4LINUX2JPEG:
-               if( strncmp(default_asset->vcodec,QUICKTIME_MJPG,4) != 0 )
-                       strncpy(default_asset->vcodec,QUICKTIME_MJPA,4);
+               vcodec = CODEC_TAG_MJPEG;
                break;
        case CAPTURE_FIREWIRE:
        case CAPTURE_IEC61883:
-               strncpy(default_asset->vcodec, QUICKTIME_DVSD, 4);
+               vcodec = CODEC_TAG_DVSD;
                break;
        }
+       if( vcodec )
+               strcpy(default_asset->vcodec, vcodec);
 
        record_batches.load_defaults(channeldb, this);
 
@@ -463,6 +465,7 @@ void Record::delete_index_file(Asset *asset)
 {
        IndexFile::delete_index(mwindow->preferences, asset, ".toc");
        IndexFile::delete_index(mwindow->preferences, asset, ".idx");
+       IndexFile::delete_index(mwindow->preferences, asset, ".mkr");
 }
 
 void Record::delete_batch()
@@ -1898,8 +1901,6 @@ int Record::stop_commercial_capture(int run_job)
        return result;
 }
 
-extern void get_exe_path(char *result); // from main.C
-
 int Record::
 spawn(const char *fmt, ...)
 {