remove v4l/lml/buz, add symbolic folders, more xlat update, yuyv fixes, v4l2 upgrades

[goodguy/history.git] / cinelerra-5.1 / cinelerra / videoconfig.C

diff --git a/cinelerra-5.1/cinelerra/videoconfig.C b/cinelerra-5.1/cinelerra/videoconfig.C
index 7da8fca4d459a43a6d15b2a7f35a164a0b0a7618..edb39aa832f3274a8c0785f3acbc5bd3ea06507a 100644 (file)
--- a/cinelerra-5.1/cinelerra/videoconfig.C
+++ b/cinelerra-5.1/cinelerra/videoconfig.C
@@ -38,8 +38,6 @@ VideoConfig& VideoConfig::operator=(VideoConfig &that)
 {
 // Input
        video_in_driver = that.video_in_driver;
-       strcpy(v4l_in_device, that.v4l_in_device);
-       strcpy(lml_in_device, that.lml_in_device);
        strcpy(screencapture_display, that.screencapture_display);
        vfirewire_in_port = that.vfirewire_in_port;
        vfirewire_in_channel = that.vfirewire_in_channel;
@@ -47,18 +45,14 @@ VideoConfig& VideoConfig::operator=(VideoConfig &that)
 
 // Output
        video_out_driver = that.video_out_driver;
-       strcpy(lml_out_device, that.lml_out_device);
        CLAMP(capture_length, 1, 1000);
        return *this;
 }
 
 int VideoConfig::load_defaults(BC_Hash *defaults)
 {
-       video_in_driver = defaults->get("VIDEO_IN_DRIVER", VIDEO4LINUX);
-       sprintf(v4l_in_device, "/dev/video");
-       defaults->get("V4L_IN_DEVICE", v4l_in_device);
-       sprintf(lml_in_device, "/dev/mvideo/stream");
-       defaults->get("LML_IN_DEVICE", lml_in_device);
+       video_in_driver = defaults->get("VIDEO_IN_DRIVER", VIDEO4LINUX2);
+       sprintf(v4l2_in_device, "/dev/video");
        sprintf(screencapture_display, "");
        defaults->get("SCREENCAPTURE_DISPLAY", screencapture_display);
        vfirewire_in_port = defaults->get("VFIREWIRE_IN_PORT", 0);
@@ -66,21 +60,16 @@ int VideoConfig::load_defaults(BC_Hash *defaults)
        capture_length = defaults->get("VIDEO_CAPTURE_LENGTH", 30);
 
        video_out_driver = defaults->get("VIDEO_OUT_DRIVER", PLAYBACK_X11);
-       sprintf(lml_out_device, "/dev/mvideo/stream");
-       defaults->get("LML_OUT_DEVICE", lml_out_device);
        return 0;
 }
 
 int VideoConfig::save_defaults(BC_Hash *defaults)
 {
        defaults->update("VIDEO_IN_DRIVER", video_in_driver);
-       defaults->update("V4L_IN_DEVICE", v4l_in_device);
-       defaults->update("LML_IN_DEVICE", lml_in_device);
        defaults->update("SCREENCAPTURE_DISPLAY", screencapture_display);
        defaults->update("VFIREWIRE_IN_PORT", vfirewire_in_port);
        defaults->update("VFIREWIRE_IN_CHANNEL", vfirewire_in_channel);
        defaults->update("VIDEO_CAPTURE_LENGTH", capture_length);
 
        defaults->update("VIDEO_OUT_DRIVER", video_out_driver);
-       defaults->update("LML_OUT_DEVICE", lml_out_device);
 }