NO-OP: reindent

This commit is contained in:
Paul Davis 2017-09-18 13:24:04 -04:00
parent 7a477fb9d6
commit c755a6c12c

View File

@ -429,57 +429,57 @@ double
timecode_to_frames_per_second(TimecodeFormat t) timecode_to_frames_per_second(TimecodeFormat t)
{ {
switch (t) { switch (t) {
case timecode_23976: case timecode_23976:
return (24000.0/1001.0); //23.976; return (24000.0/1001.0); //23.976;
break; break;
case timecode_24: case timecode_24:
return 24; return 24;
break; break;
case timecode_24976: case timecode_24976:
return (25000.0/1001.0); //24.976; return (25000.0/1001.0); //24.976;
break; break;
case timecode_25: case timecode_25:
return 25; return 25;
break; break;
case timecode_2997: case timecode_2997:
return (30000.0/1001.0); //29.97; return (30000.0/1001.0); //29.97;
break; break;
case timecode_2997drop: case timecode_2997drop:
return (30000.0/1001.0); //29.97; return (30000.0/1001.0); //29.97;
break; break;
case timecode_2997000: case timecode_2997000:
return 29.97; return 29.97;
break; break;
case timecode_2997000drop: case timecode_2997000drop:
return 29.97; return 29.97;
break; break;
case timecode_30: case timecode_30:
return 30; return 30;
break; break;
case timecode_30drop: case timecode_30drop:
return 30; return 30;
break; break;
case timecode_5994: case timecode_5994:
return (60000.0/1001.0); //59.94; return (60000.0/1001.0); //59.94;
break; break;
case timecode_60: case timecode_60:
return 60; return 60;
break; break;
default: default:
//std::cerr << "Editor received unexpected timecode type" << std::endl; //std::cerr << "Editor received unexpected timecode type" << std::endl;
break; break;
} }
return 30.0; return 30.0;
} }
@ -488,57 +488,57 @@ bool
timecode_has_drop_frames(TimecodeFormat t) timecode_has_drop_frames(TimecodeFormat t)
{ {
switch (t) { switch (t) {
case timecode_23976: case timecode_23976:
return false; return false;
break; break;
case timecode_24: case timecode_24:
return false; return false;
break; break;
case timecode_24976: case timecode_24976:
return false; return false;
break; break;
case timecode_25: case timecode_25:
return false; return false;
break; break;
case timecode_2997: case timecode_2997:
return false; return false;
break; break;
case timecode_2997drop: case timecode_2997drop:
return true; return true;
break; break;
case timecode_2997000: case timecode_2997000:
return false; return false;
break; break;
case timecode_2997000drop: case timecode_2997000drop:
return true; return true;
break; break;
case timecode_30: case timecode_30:
return false; return false;
break; break;
case timecode_30drop: case timecode_30drop:
return true; return true;
break; break;
case timecode_5994: case timecode_5994:
return false; return false;
break; break;
case timecode_60: case timecode_60:
return false; return false;
break; break;
default: default:
//error << "Editor received unexpected timecode type" << endmsg; //error << "Editor received unexpected timecode type" << endmsg;
break; break;
} }
return false; return false;
@ -548,50 +548,50 @@ std::string
timecode_format_name (TimecodeFormat const t) timecode_format_name (TimecodeFormat const t)
{ {
switch (t) { switch (t) {
case timecode_23976: case timecode_23976:
return "23.98"; return "23.98";
break; break;
case timecode_24: case timecode_24:
return "24"; return "24";
break; break;
case timecode_24976: case timecode_24976:
return "24.98"; return "24.98";
break; break;
case timecode_25: case timecode_25:
return "25"; return "25";
break; break;
case timecode_2997000: case timecode_2997000:
case timecode_2997: case timecode_2997:
return "29.97"; return "29.97";
break; break;
case timecode_2997000drop: case timecode_2997000drop:
case timecode_2997drop: case timecode_2997drop:
return "29.97 drop"; return "29.97 drop";
break; break;
case timecode_30: case timecode_30:
return "30"; return "30";
break; break;
case timecode_30drop: case timecode_30drop:
return "30 drop"; return "30 drop";
break; break;
case timecode_5994: case timecode_5994:
return "59.94"; return "59.94";
break; break;
case timecode_60: case timecode_60:
return "60"; return "60";
break; break;
default: default:
break; break;
} }
return "??"; return "??";
@ -602,25 +602,25 @@ std::string timecode_format_time (Timecode::Time TC)
char buf[32]; char buf[32];
if (TC.negative) { if (TC.negative) {
snprintf (buf, sizeof (buf), "-%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 "%c%02" PRIu32, snprintf (buf, sizeof (buf), "-%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 "%c%02" PRIu32,
TC.hours, TC.minutes, TC.seconds, TC.drop ? ';' : ':', TC.frames); TC.hours, TC.minutes, TC.seconds, TC.drop ? ';' : ':', TC.frames);
} else { } else {
snprintf (buf, sizeof (buf), " %02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 "%c%02" PRIu32, snprintf (buf, sizeof (buf), " %02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 "%c%02" PRIu32,
TC.hours, TC.minutes, TC.seconds, TC.drop ? ';' : ':', TC.frames); TC.hours, TC.minutes, TC.seconds, TC.drop ? ';' : ':', TC.frames);
} }
return std::string(buf); return std::string(buf);
} }
std::string timecode_format_sampletime ( std::string timecode_format_sampletime (
int64_t sample, int64_t sample,
double sample_sample_rate, double sample_sample_rate,
double timecode_frames_per_second, bool timecode_drop_frames) double timecode_frames_per_second, bool timecode_drop_frames)
{ {
Time t; Time t;
sample_to_timecode( sample_to_timecode(
sample, t, false, false, sample, t, false, false,
timecode_frames_per_second, timecode_drop_frames, timecode_frames_per_second, timecode_drop_frames,
sample_sample_rate, sample_sample_rate,
80, false, 0); 80, false, 0);
return timecode_format_time(t); return timecode_format_time(t);
} }
@ -629,7 +629,7 @@ bool parse_timecode_format(std::string tc, Timecode::Time &TC) {
char ignored[2]; char ignored[2];
TC.subframes = 0; TC.subframes = 0;
if (sscanf (tc.c_str(), "%[- ]%" PRId32 ":%" PRId32 ":%" PRId32 "%[:;]%" PRId32, if (sscanf (tc.c_str(), "%[- ]%" PRId32 ":%" PRId32 ":%" PRId32 "%[:;]%" PRId32,
negative, &TC.hours, &TC.minutes, &TC.seconds, ignored, &TC.frames) != 6) { negative, &TC.hours, &TC.minutes, &TC.seconds, ignored, &TC.frames) != 6) {
TC.hours = TC.minutes = TC.seconds = TC.frames = 0; TC.hours = TC.minutes = TC.seconds = TC.frames = 0;
TC.negative = false; TC.negative = false;
return false; return false;
@ -644,14 +644,14 @@ bool parse_timecode_format(std::string tc, Timecode::Time &TC) {
void void
timecode_to_sample( timecode_to_sample(
Timecode::Time& timecode, int64_t& sample, Timecode::Time& timecode, int64_t& sample,
bool use_offset, bool use_subframes, bool use_offset, bool use_subframes,
/* Note - framerate info is taken from Timecode::Time& */ /* Note - framerate info is taken from Timecode::Time& */
double sample_sample_rate /**< may include pull up/down */, double sample_sample_rate /**< may include pull up/down */,
uint32_t subframes_per_frame, uint32_t subframes_per_frame,
/* optional offset - can be improved: function pointer to lazily query this*/ /* optional offset - can be improved: function pointer to lazily query this*/
bool offset_is_negative, int64_t offset_samples bool offset_is_negative, int64_t offset_samples
) )
{ {
const double samples_per_timecode_frame = (double) sample_sample_rate / (double) timecode.rate; const double samples_per_timecode_frame = (double) sample_sample_rate / (double) timecode.rate;
@ -710,19 +710,19 @@ timecode_to_sample(
sample = frameNumber * sample_sample_rate / (double) timecode.rate; sample = frameNumber * sample_sample_rate / (double) timecode.rate;
} else { } else {
/* /*
Non drop is easy.. just note the use of Non drop is easy.. just note the use of
rint(timecode.rate) * samples_per_timecode_frame rint(timecode.rate) * samples_per_timecode_frame
(frames per Timecode second), which is larger than (frames per Timecode second), which is larger than
sample_rate() in the non-integer Timecode rate case. sample_rate() in the non-integer Timecode rate case.
*/ */
sample = (int64_t) rint( sample = (int64_t) rint(
( (
((timecode.hours * 60 * 60) + (timecode.minutes * 60) + timecode.seconds) ((timecode.hours * 60 * 60) + (timecode.minutes * 60) + timecode.seconds)
* *
(rint(timecode.rate) * samples_per_timecode_frame) (rint(timecode.rate) * samples_per_timecode_frame)
) )
+ (timecode.frames * samples_per_timecode_frame) + (timecode.frames * samples_per_timecode_frame)
); );
} }
@ -755,16 +755,16 @@ timecode_to_sample(
void void
sample_to_timecode ( sample_to_timecode (
int64_t sample, Timecode::Time& timecode, int64_t sample, Timecode::Time& timecode,
bool use_offset, bool use_subframes, bool use_offset, bool use_subframes,
/* framerate info */ /* framerate info */
double timecode_frames_per_second, double timecode_frames_per_second,
bool timecode_drop_frames, bool timecode_drop_frames,
double sample_sample_rate/**< can include pull up/down */, double sample_sample_rate/**< can include pull up/down */,
uint32_t subframes_per_frame, uint32_t subframes_per_frame,
/* optional offset - can be improved: function pointer to lazily query this*/ /* optional offset - can be improved: function pointer to lazily query this*/
bool offset_is_negative, int64_t offset_samples bool offset_is_negative, int64_t offset_samples
) )
{ {
int64_t offset_sample; int64_t offset_sample;
@ -794,7 +794,7 @@ sample_to_timecode (
const int64_t M = frameNumber % 17982; const int64_t M = frameNumber % 17982;
timecode.subframes = rint(subframes_per_frame timecode.subframes = rint(subframes_per_frame
* ((double)offset_sample * timecode_frames_per_second / sample_sample_rate - (double)frameNumber)); * ((double)offset_sample * timecode_frames_per_second / sample_sample_rate - (double)frameNumber));
if (timecode.subframes == subframes_per_frame) { if (timecode.subframes == subframes_per_frame) {
timecode.subframes = 0; timecode.subframes = 0;