X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Frecord.C;h=ffa2b2825e4b87b865200019be04a0bb97fc6722;hb=f9d0d999e813ae19965e07ae2f7da690b4e6fe45;hp=ebf770b46da0fa7a67ce64e2c5995374ad640348;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/record.C b/cinelerra-5.0/cinelerra/record.C index ebf770b4..ffa2b282 100644 --- 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); @@ -721,7 +723,7 @@ double Record::current_display_position() const char* Record::current_source() { Batch *batch = get_current_batch(); - return batch ? batch->get_source_text() : "Unknown"; + return batch ? batch->get_source_text() : _("Unknown"); } Asset* Record::current_asset() @@ -1187,7 +1189,7 @@ void Record::start_cron_thread() record_thread = new RecordThread(mwindow,this); record_thread->start(); record_gui->disable_batch_buttons(); - record_gui->update_cron_status("Running"); + record_gui->update_cron_status(_("Running")); } } @@ -1898,8 +1900,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, ...) {