mirror of https://github.com/mpv-player/mpv
all cosmetics, mainly denestifying of main edl operation's fill loop
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18909 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
31e90a9aae
commit
64fbd3f57c
116
edl.c
116
edl.c
|
@ -69,63 +69,71 @@ edl_record_ptr edl_parse_file(void)
|
|||
if ((fd = fopen(edl_filename, "r")) == NULL)
|
||||
{
|
||||
return NULL;
|
||||
} else
|
||||
{
|
||||
while (fgets(line, 99, fd) != NULL)
|
||||
{
|
||||
lineCount++;
|
||||
if ((sscanf(line, "%f %f %d", &start, &stop, &action))
|
||||
!= 3)
|
||||
{
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadlyFormattedLine,
|
||||
lineCount);
|
||||
continue;
|
||||
} else
|
||||
{
|
||||
if (next_edl_record && start <= next_edl_record->stop_sec)
|
||||
{
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlNOValidLine, line);
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadLineOverlap,
|
||||
next_edl_record->stop_sec, start);
|
||||
continue;
|
||||
}
|
||||
if (stop <= start)
|
||||
{
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlNOValidLine,
|
||||
line);
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadLineBadStop);
|
||||
continue;
|
||||
}
|
||||
next_edl_record = edl_alloc_new(next_edl_record);
|
||||
if (!edl_records) edl_records = next_edl_record;
|
||||
|
||||
next_edl_record->action = action;
|
||||
if (action == EDL_MUTE)
|
||||
{
|
||||
next_edl_record->length_sec = 0;
|
||||
next_edl_record->start_sec = start;
|
||||
next_edl_record->stop_sec = start;
|
||||
|
||||
next_edl_record = edl_alloc_new(next_edl_record);
|
||||
|
||||
next_edl_record->action = action;
|
||||
next_edl_record->length_sec = 0;
|
||||
next_edl_record->start_sec = stop;
|
||||
next_edl_record->stop_sec = stop;
|
||||
} else
|
||||
{
|
||||
next_edl_record->length_sec = stop - start;
|
||||
next_edl_record->start_sec = start;
|
||||
next_edl_record->stop_sec = stop;
|
||||
}
|
||||
record_count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
while (fgets(line, 99, fd) != NULL)
|
||||
{
|
||||
lineCount++;
|
||||
|
||||
if ((sscanf(line, "%f %f %d", &start, &stop, &action))
|
||||
!= 3)
|
||||
{
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadlyFormattedLine,
|
||||
lineCount);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (next_edl_record && start <= next_edl_record->stop_sec)
|
||||
{
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlNOValidLine, line);
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadLineOverlap,
|
||||
next_edl_record->stop_sec, start);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (stop <= start)
|
||||
{
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlNOValidLine,
|
||||
line);
|
||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadLineBadStop);
|
||||
continue;
|
||||
}
|
||||
|
||||
next_edl_record = edl_alloc_new(next_edl_record);
|
||||
|
||||
if (!edl_records) edl_records = next_edl_record;
|
||||
|
||||
next_edl_record->action = action;
|
||||
|
||||
if (action == EDL_MUTE)
|
||||
{
|
||||
next_edl_record->length_sec = 0;
|
||||
next_edl_record->start_sec = start;
|
||||
next_edl_record->stop_sec = start;
|
||||
|
||||
next_edl_record = edl_alloc_new(next_edl_record);
|
||||
|
||||
next_edl_record->action = action;
|
||||
next_edl_record->length_sec = 0;
|
||||
next_edl_record->start_sec = stop;
|
||||
next_edl_record->stop_sec = stop;
|
||||
} else
|
||||
{
|
||||
next_edl_record->length_sec = stop - start;
|
||||
next_edl_record->start_sec = start;
|
||||
next_edl_record->stop_sec = stop;
|
||||
}
|
||||
|
||||
record_count++;
|
||||
}
|
||||
|
||||
fclose(fd);
|
||||
}
|
||||
if (edl_records) mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlRecordsNo, record_count);
|
||||
else mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlQueueEmpty);
|
||||
|
||||
if (edl_records)
|
||||
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlRecordsNo, record_count);
|
||||
else
|
||||
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlQueueEmpty);
|
||||
|
||||
return edl_records;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue