eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-06 06:55:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix commandline option -t/--timer (either on or off, system default is high resolution realtime clock)

Browse Source
This commit is contained in:
niels
2015-06-24 00:51:28 +02:00
parent 57b27e40f4
commit 999854a979
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
veejay-current/veejay-server/man/veejay.1
View File

@@ -92,8 +92,8 @@ Do not 'canonicalise' pathnames in editlists
.B \-v/--verbose
verbosity on/off
.TP
.B \-t/--timer [012]
timer to use ( none, normal, rtc )
.B \-t/--timer [01]
timer to use ( none, default timer )
.TP
.B \-f/--fps <num>
Override framerate of video. Disables audio when used.

2
veejay-current/veejay-server/veejay/liblavplayvj.c
View File

@@ -1722,7 +1722,7 @@ int veejay_init(veejay_t * info, int x, int y,char *arg, int def_tags, int gen_t
veejay_msg(VEEJAY_MSG_WARNING, "Not timing audio/video");
break;
default:
veejay_msg(VEEJAY_MSG_DEBUG, "Using clock_nanosleep timer");
veejay_msg(VEEJAY_MSG_DEBUG, "Using high-resolution clock to time audio/video");
break;
}

6
veejay-current/veejay-server/veejay/veejay.c
View File

@@ -211,7 +211,7 @@ static void Usage(char *progname)
fprintf(stderr,
" -Y/--yuv [01]\t\t\tForce YCbCr (defaults to YUV)\n");
fprintf(stderr,
" -t/--timer <num>\t\tspecify timer to use (none:0,normal:2,rtc:1) default is 1\n");
" -t/--timer <num>\t\tSpecify timer to use (0=none, 1=default timer) (default=1) \n");
fprintf(stderr,
" -P/--preserve-pathnames\tDo not 'canonicalise' pathnames in edit lists\n");
fprintf(stderr,
@@ -352,8 +352,8 @@ static int set_option(const char *name, char *value)
info->qrcode = 1;
} else if (strcmp(name, "timer") == 0 || strcmp(name, "t") == 0) {
info->uc->use_timer = atoi(optarg);
if (info->uc->use_timer < 0 || info->uc->use_timer > 2) {
printf("Valid timers:\n\t0=none\n\t2=normal\n\t1=rtc\n");
if (info->uc->use_timer < 0 || info->uc->use_timer > 1) {
fprintf(stderr, "Valid timers:\n\t0=none\n\t1=default timer\n");
nerr++;
}
} else if (strcmp(name, "multicast-vims") == 0 || strcmp(name,"T")==0)