merged hv7 mod

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

diff --git a/cinelerra-5.1/cinelerra/record.C b/cinelerra-5.1/cinelerra/record.C
index d2247d57bd7d9e14a932eb704bff1b3da36fc4cb..3ea53a42ffa4a82da550707c819d252afc8c1ce1 100644 (file)
--- a/cinelerra-5.1/cinelerra/record.C
+++ b/cinelerra-5.1/cinelerra/record.C
@@ -1,21 +1,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2009-2013 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "asset.h"
@@ -163,7 +163,7 @@ Record::Record(MWindow *mwindow, RecordMenuItem *menu_item)
 Record::~Record()
 {
        mwindow->gui->record = 0;
-       stop();  join();
+       stop();
        delete blink_status;
        delete cutads_status;
        stop_skimming();
@@ -202,10 +202,6 @@ int Record::load_defaults()
 // These are locked by a specific driver.
        const char *vcodec = 0;
        switch( session->vconfig_in->driver ) {
-       case CAPTURE_LML:
-       case CAPTURE_BUZ:
-               vcodec = CODEC_TAG_MJPEG;
-               break;
        case CAPTURE_DVB:
        case VIDEO4LINUX2MPEG:
                break;
@@ -234,6 +230,8 @@ int Record::load_defaults()
        video_zoom = defaults->get("RECORD_VIDEO_Z", (float)1);
        picture->load_defaults();
        reverse_interlace = defaults->get("REVERSE_INTERLACE", 0);
+       do_cursor = defaults->get("RECORD_CURSOR", 0);
+       do_big_cursor = defaults->get("RECORD_BIG_CURSOR", 0);
        for( int i=0; i<MAXCHANNELS; ++i ) {
                sprintf(string, "RECORD_DCOFFSET_%d", i);
                dc_offset[i] = defaults->get(string, 0);
@@ -270,6 +268,8 @@ int Record::save_defaults()
        defaults->update("RECORD_VIDEO_Z", video_zoom);
        picture->save_defaults();
        defaults->update("REVERSE_INTERLACE", reverse_interlace);
+       defaults->update("RECORD_CURSOR", do_cursor);
+       defaults->update("RECORD_BIG_CURSOR", do_big_cursor);
        for( int i=0; i<MAXCHANNELS; ++i ) {
                sprintf(string, "RECORD_DCOFFSET_%d", i);
                defaults->update(string, dc_offset[i]);
@@ -373,7 +373,7 @@ void Record::run()
                if( channel )
                        video_stream = channel->video_stream;
        }
-       stop();
+       stop(0);
        edl->Garbage::remove_user();
 
        if( mwindow->gui->remote_control->deactivate() )
@@ -405,9 +405,10 @@ void Record::run()
                        mwindow->undo->update_undo_before();
 // For pasting, clear the active region
                        if(load_mode == LOADMODE_PASTE)
-                               mwindow->clear(0);
-
-                       mwindow->paste_edls(&new_edls, load_mode, 0, -1,
+                               mwindow->clear(0, 1);
+                       int loadmode = load_mode == LOADMODE_RESOURCESONLY ?
+                               LOADMODE_ASSETSONLY : load_mode;
+                       mwindow->paste_edls(&new_edls, loadmode, 0, -1,
                                SESSION->labels_follow_edits,
                                SESSION->plugins_follow_edits,
                                SESSION->autos_follow_edits,
@@ -437,9 +438,13 @@ void Record::run()
        default_asset->Garbage::remove_user();
 }
 
-void Record::stop()
+void Record::stop(int wait)
 {
        stop_operation();
+       if( record_gui )
+               record_gui->set_done(1);
+       if( wait )
+               join();
        window_lock->lock("Record::stop");
        delete record_thread;   record_thread = 0;
        delete record_monitor;  record_monitor = 0;
@@ -592,7 +597,6 @@ void Record::start()
                window_lock->unlock();
        }
        else {
-               stop();  join();
                init_lock->reset();
                Thread::start();
        }
@@ -742,8 +746,8 @@ Channel *Record::get_editing_channel()
        return batch ? batch->channel : 0;
 }
 
-ArrayList<Channel*>* Record::get_video_inputs() 
-{ 
+ArrayList<Channel*>* Record::get_video_inputs()
+{
        return default_asset->video_data && vdevice ? vdevice->get_inputs() : 0;
 }
 
@@ -969,11 +973,11 @@ void Record::open_audio_input()
        if( adevice ) {
                int sw_pos = SESSION->record_positioning == RECORD_POS_SOFTWARE;
                adevice->set_software_positioning(sw_pos);
-               adevice->open_input(SESSION->aconfig_in, SESSION->vconfig_in, 
+               adevice->open_input(SESSION->aconfig_in, SESSION->vconfig_in,
                        default_asset->sample_rate, get_fragment_samples(),
                        default_asset->channels, SESSION->real_time_record);
                adevice->start_recording();
-               adevice->open_monitor(SESSION->playback_config->aconfig,monitor_audio); 
+               adevice->open_monitor(SESSION->playback_config->aconfig,monitor_audio);
                adevice->set_vdevice(vdevice);
                if( vdevice ) vdevice->set_adevice(adevice);
        }
@@ -996,6 +1000,7 @@ void Record::open_video_input()
                master_channel->copy_usage(vdevice->channel);
                picture->copy_usage(vdevice->picture);
                vdevice->set_field_order(reverse_interlace);
+               vdevice->set_do_cursor(do_cursor, do_big_cursor);
                vdevice->set_adevice(adevice);
                if( adevice ) adevice->set_vdevice(vdevice);
                set_dev_channel(get_current_channel());
@@ -1072,7 +1077,7 @@ int Record::start_toc()
        Asset *asset = batch->asset;
        char source_filename[BCTEXTLEN], toc_path[BCTEXTLEN];
        IndexFile::get_index_filename(source_filename,
-               mwindow->preferences->index_directory, 
+               mwindow->preferences->index_directory,
                toc_path, asset->path,".toc");
        if( default_asset->video_data )
                return vdevice->start_toc(asset->path, toc_path);
@@ -1096,8 +1101,8 @@ void Record::start_writing_file()
        if( !writing_file ) {
                written_frames = 0;
                written_samples = 0;
-               do_video = File::supports_video(default_asset->format);
-               do_audio = File::supports_audio(default_asset->format);
+               do_video = File::renders_video(default_asset);
+               do_audio = File::renders_audio(default_asset);
                if( single_frame ) do_audio = 0;
                if( !do_video && single_frame )
                        single_frame = 0;
@@ -1208,11 +1213,15 @@ void Record::set_power_off(int value)
        record_gui->power_off->update(value);
 }
 
-int Record::set_video_picture()
+void Record::set_video_picture()
 {
        if( default_asset->video_data && vdevice )
                vdevice->set_picture(picture);
-       return 0;
+}
+
+void Record::set_do_cursor()
+{
+       vdevice->set_do_cursor(do_cursor, do_big_cursor);
 }
 
 void Record::set_translation(int x, int y)
@@ -1528,7 +1537,7 @@ display_cut_icon(int x, int y)
 #ifdef HAVE_DVB
 DeviceDVBInput *Record::
 dvb_device()
-{ 
+{
        DeviceDVBInput *dvb_dev = !vdevice ? 0 :
                (DeviceDVBInput *)vdevice->mpeg_device();
        if( !dvb_dev ) dvb_dev = !adevice ? 0 :