projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
req input focus wdw be viewable
[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 473e10c32c1a4b185ddb898242e5b761ea96fc11..96ec0f8236284bd5a88f6fa504dd728d3e6ec89d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/record.C
+++ b/
cinelerra-5.1/cinelerra/record.C
@@
-155,19
+155,23
@@
Record::Record(MWindow *mwindow, RecordMenuItem *menu_item)
adevice_lock = new Mutex("Record::adevice_lock");
vdevice_lock = new Mutex("Record::vdevice_lock");
batch_lock = new Mutex("Record::batch_lock");
adevice_lock = new Mutex("Record::adevice_lock");
vdevice_lock = new Mutex("Record::vdevice_lock");
batch_lock = new Mutex("Record::batch_lock");
+#ifdef HAVE_COMMERCIAL
skim_thread = new SkimDbThread();
cutads_status = new RecordCutAdsStatus(this);
blink_status = new RecordBlinkStatus(this);
skim_thread = new SkimDbThread();
cutads_status = new RecordCutAdsStatus(this);
blink_status = new RecordBlinkStatus(this);
+#endif
}
Record::~Record()
{
mwindow->gui->record = 0;
stop();
}
Record::~Record()
{
mwindow->gui->record = 0;
stop();
+#ifdef HAVE_COMMERCIAL
delete blink_status;
delete cutads_status;
stop_skimming();
delete skim_thread;
delete blink_status;
delete cutads_status;
stop_skimming();
delete skim_thread;
+#endif
delete deletions;
delete picture;
delete channeldb;
delete deletions;
delete picture;
delete channeldb;
@@
-366,13
+370,17
@@
void Record::run()
// Need to stop everything this time
// Need to stop everything this time
- stop_commercial_capture(0);
int video_stream = -1;
int video_stream = -1;
+#ifdef HAVE_COMMERCIAL
+ stop_commercial_capture(0);
+#endif
+#ifdef HAVE_LIBZMPEG
if( default_asset->format == FILE_MPEG ) {
Channel *channel = get_current_channel();
if( channel )
video_stream = channel->video_stream;
}
if( default_asset->format == FILE_MPEG ) {
Channel *channel = get_current_channel();
if( channel )
video_stream = channel->video_stream;
}
+#endif
stop(0);
edl->Garbage::remove_user();
stop(0);
edl->Garbage::remove_user();
@@
-1462,7
+1470,7
@@
int Record::check_batch_complete()
return result;
}
return result;
}
-
+#ifdef HAVE_COMMERCIAL
int Record::skimming(void *vp, int track)
{
return ((Record*)vp)->skimming(track);
int Record::skimming(void *vp, int track)
{
return ((Record*)vp)->skimming(track);
@@
-1505,6
+1513,14
@@
void Record::update_skimming(int v)
stop_skimming();
}
stop_skimming();
}
+#else
+int Record::skimming(void *vp, int track) { return 1; }
+int Record::skimming(int track) { return 1; }
+void Record::start_skimming() {}
+void Record::stop_skimming() {}
+void Record::update_skimming(int v) {}
+#endif
+
RecordRemoteHandler::RecordRemoteHandler(RemoteControl *remote_control)
: RemoteHandler(remote_control->gui, GREEN)
{
RecordRemoteHandler::RecordRemoteHandler(RemoteControl *remote_control)
: RemoteHandler(remote_control->gui, GREEN)
{
@@
-1766,6
+1782,7
@@
int Record::remote_process_key(RemoteControl *remote_control, int key)
break;
//case UP: case DOWN: case LEFT: case RIGHT:
//case KPPLAY: case KPBACK: case KPFORW:
break;
//case UP: case DOWN: case LEFT: case RIGHT:
//case KPPLAY: case KPBACK: case KPFORW:
+#ifdef HAVE_COMMERCIAL
case KPRECD: case 'c': // start capture, mark endpoint
if( !deletions ) {
start_commercial_capture();
case KPRECD: case 'c': // start capture, mark endpoint
if( !deletions ) {
start_commercial_capture();
@@
-1785,6
+1802,7
@@
int Record::remote_process_key(RemoteControl *remote_control, int key)
case KPAUSE: case 'x': // ignore current commercial
mark_commercial_capture(DEL_SKIP);
break;
case KPAUSE: case 'x': // ignore current commercial
mark_commercial_capture(DEL_SKIP);
break;
+#endif
case KPBACK: case 'a': // toggle mute audio
if( !monitor_audio ) { set_mute_gain(1); set_play_gain(1); }
set_audio_monitoring(monitor_audio ? 0 : 1);
case KPBACK: case 'a': // toggle mute audio
if( !monitor_audio ) { set_mute_gain(1); set_play_gain(1); }
set_audio_monitoring(monitor_audio ? 0 : 1);
@@
-1792,9
+1810,11
@@
int Record::remote_process_key(RemoteControl *remote_control, int key)
case 'm': // toggle metering audio
set_audio_metering(metering_audio ? 0 : 1);
break;
case 'm': // toggle metering audio
set_audio_metering(metering_audio ? 0 : 1);
break;
+#ifdef HAVE_COMMERCIAL
case KPPLAY: case 's': // ignore previous endpoint
mark_commercial_capture(DEL_OOPS);
break;
case KPPLAY: case 's': // ignore previous endpoint
mark_commercial_capture(DEL_OOPS);
break;
+#endif
case KPFWRD: case KPSLASH:
display_channel_info();
break;
case KPFWRD: case KPSLASH:
display_channel_info();
break;
@@
-1822,7
+1842,7
@@
int Record::remote_process_key(RemoteControl *remote_control, int key)
return 1;
}
return 1;
}
-
+#ifdef HAVE_COMMERCIAL
int Record::start_commercial_capture()
{
if( deletions != 0 ) return 1;
int Record::start_commercial_capture()
{
if( deletions != 0 ) return 1;
@@
-1860,6
+1880,7
@@
int Record::mark_commercial_capture(int action)
deletions->append(new Dele(time, action));
return 0;
}
deletions->append(new Dele(time, action));
return 0;
}
+#endif
void Record::remote_fill_color(int color)
{
void Record::remote_fill_color(int color)
{
@@
-1884,6
+1905,7
@@
void Record::set_play_gain(double gain)
if( adevice ) adevice->set_play_gain(gain);
}
if( adevice ) adevice->set_play_gain(gain);
}
+#ifdef HAVE_COMMERCIAL
int Record::stop_commercial_capture(int run_job)
{
if( deletions == 0 ) return 1;
int Record::stop_commercial_capture(int run_job)
{
if( deletions == 0 ) return 1;
@@
-2057,3
+2079,4
@@
run()
remote_color(record->status_color);
}
remote_color(record->status_color);
}
+#endif