projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add haupauge-1657 dual usb capture support, add deinterlace to recordmonitor, asset...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
record.C
diff --git
a/cinelerra-5.1/cinelerra/record.C
b/cinelerra-5.1/cinelerra/record.C
index 4b8accd38ab0cc1b59779e671a5899c479240158..c788340eb2eba04c21a51aca5f4985caf29290ef 100644
(file)
--- a/
cinelerra-5.1/cinelerra/record.C
+++ b/
cinelerra-5.1/cinelerra/record.C
@@
-160,6
+160,7
@@
Record::Record(MWindow *mwindow, RecordMenuItem *menu_item)
cutads_status = new RecordCutAdsStatus(this);
blink_status = new RecordBlinkStatus(this);
#endif
cutads_status = new RecordCutAdsStatus(this);
blink_status = new RecordBlinkStatus(this);
#endif
+ deinterlace = RECORD_LACE_ODD;
}
Record::~Record()
}
Record::~Record()
@@
-234,6
+235,7
@@
int Record::load_defaults()
video_zoom = defaults->get("RECORD_VIDEO_Z", (float)1);
picture->load_defaults();
reverse_interlace = defaults->get("REVERSE_INTERLACE", 0);
video_zoom = defaults->get("RECORD_VIDEO_Z", (float)1);
picture->load_defaults();
reverse_interlace = defaults->get("REVERSE_INTERLACE", 0);
+ deinterlace = defaults->get("DEINTERLACE", RECORD_LACE_ODD);
do_cursor = defaults->get("RECORD_CURSOR", 0);
do_big_cursor = defaults->get("RECORD_BIG_CURSOR", 0);
for( int i=0; i<MAXCHANNELS; ++i ) {
do_cursor = defaults->get("RECORD_CURSOR", 0);
do_big_cursor = defaults->get("RECORD_BIG_CURSOR", 0);
for( int i=0; i<MAXCHANNELS; ++i ) {
@@
-272,6
+274,7
@@
int Record::save_defaults()
defaults->update("RECORD_VIDEO_Z", video_zoom);
picture->save_defaults();
defaults->update("REVERSE_INTERLACE", reverse_interlace);
defaults->update("RECORD_VIDEO_Z", video_zoom);
picture->save_defaults();
defaults->update("REVERSE_INTERLACE", reverse_interlace);
+ defaults->update("DEINTERLACE", deinterlace);
defaults->update("RECORD_CURSOR", do_cursor);
defaults->update("RECORD_BIG_CURSOR", do_big_cursor);
for( int i=0; i<MAXCHANNELS; ++i ) {
defaults->update("RECORD_CURSOR", do_cursor);
defaults->update("RECORD_BIG_CURSOR", do_big_cursor);
for( int i=0; i<MAXCHANNELS; ++i ) {
@@
-474,9
+477,7
@@
void Record::activate_batch(int number)
void Record::delete_index_file(Asset *asset)
{
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");
+ IndexFile::delete_index_files(mwindow->preferences, asset);
}
void Record::delete_batch()
}
void Record::delete_batch()
@@
-1828,8
+1829,9
@@
int Record::remote_process_key(RemoteControl *remote_control, int key)
channel_down();
break;
case 'f': {
channel_down();
break;
case 'f': {
- Canvas *canvas = record_monitor->window->canvas;
- canvas->use_fullscreen(canvas->get_fullscreen() ? 0 : 1);
+ RecordMonitorCanvas *canvas = record_monitor->window->canvas;
+ int on = canvas->get_fullscreen() ? 0 : 1;
+ canvas->Canvas::set_fullscreen(on, 0);
break; }
default:
return -1;
break; }
default:
return -1;