eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-13 19:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

HelpUpdate : fix option in veejay.c - review man veejay examples

Browse Source 
veejay.c
* comment was missing on xinerama stuff
* fix -M short option
* dynamic-fx-chain short is now -X
This commit is contained in:
Jerome Blanchi aka d.j.a.y
2019-06-27 14:34:02 +02:00
parent 4cf71cd421
commit 5dcb7cb8c2
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veejay-current/veejay-server/doc/veejay-HOWTO.md
View File

@@ -580,7 +580,7 @@ You can dynamically assign keybindings to trigger a bundle in reloaded ( Menu ->
There is an example Action File that a number of bundles with keybindings: There is an example Action File that a number of bundles with keybindings:
``` ```
$ veejay -v /path/to/video.avi -F test/livecinema/action-file.xml $ veejay -g /path/to/video.avi -F test/livecinema/action-file.xml
``` ```
The bundles can be triggered by the keys SHIFT + [ q,w,e,r,t,y,u,i,o,p,a,s,d,f,g,h,j,k,l,z,x,c,v,b,n,m ] The bundles can be triggered by the keys SHIFT + [ q,w,e,r,t,y,u,i,o,p,a,s,d,f,g,h,j,k,l,z,x,c,v,b,n,m ]

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

@@ -570,19 +570,26 @@ Startup veejay and list all events (VIMS/OSC) and effect descriptions
.B veejay -p 4000 ~/my_video1.avi .B veejay -p 4000 ~/my_video1.avi
Startup veejay listening on port 4000 (use this to use multiple veejays) Startup veejay listening on port 4000 (use this to use multiple veejays)
.TP .TP
.B veejay -d -W 352 -H 288 -R 25 -N 0 .B veejay -d -W 352 -H 288 -N 0 -a 0
Startup veejay using dummy video at 25 frames per second, dimensions 352x288 Startup veejay using dummy video, dimensions 352x288, using PAL and no audio.
and using PAL.
.TP .TP
.B veejay movie1.avi -V 224.0.0.50 -p 5000 -n -v .B veejay movie1.avi -M 224.0.0.50 -p 5000 -n -v
Startup veejay, using multicast protocol on port 5000, with autolooping Startup veejay, using osc multicast protocol on port 5000 and no colored but verbose output
and no colored verbose output
.TP .TP
.B veejay --output 5 --output-file /dev/video1 .B veejay -g movie1.avi movie2.avi movie3.avi --output 5 --output-file /dev/video1
Startup veejay headless and write video output to a vloopback device Startup veejay headless and use given clip as sample, the video output is writen
to /dev/video1 (a video loopback device)
You will need something like v4l2looback kernel module to setup the video loopback.
Only the video channel is writen to the loopback device! audio, if any, still goes to jack
.TP .TP
.B veejay --output 4 --output-file /tmp/video-yuv4mpeg.pipe .B veejay movie1.avi --output 4 --output-file /tmp/video-yuv4mpeg.pipe
Startup veejay headless and write yuv4mpeg video to a named fifo pipe Startup veejay headless and write yuv4mpeg video to a named fifo pipe.
Only video channel goes to the pipe! the audio still goes to jack
Dues how pipe works, audio and video could lost synchro
.TP .TP
.SH REFERENCES .SH REFERENCES
.TP .TP

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

@@ -332,7 +332,7 @@ static void Usage(char *progname)
fprintf(stderr, fprintf(stderr,
" -S/--scene-detection <num>\tCreate new samples based on scene detection threshold <num>\n"); " -S/--scene-detection <num>\tCreate new samples based on scene detection threshold <num>\n");
fprintf(stderr, fprintf(stderr,
" -M/--dynamic-fx-chain\t\tDo not keep FX chain buffers in RAM (default off)\n"); " -X/--dynamic-fx-chain\t\tDo not keep FX chain buffers in RAM (default off)\n");
fprintf(stderr, fprintf(stderr,
" /--split-screen\t\tLoad split screen configuration\n"); " /--split-screen\t\tLoad split screen configuration\n");
fprintf(stderr, fprintf(stderr,
@@ -393,7 +393,7 @@ static int set_option(const char *name, char *value)
info->settings->use_vims_mcast = 1; info->settings->use_vims_mcast = 1;
info->settings->vims_group_name = strdup(optarg); info->settings->vims_group_name = strdup(optarg);
} }
else if (strcmp(name, "multicast-osc") == 0 ) else if (strcmp(name, "multicast-osc") == 0 || strcmp(name,"M")==0)
{ {
check_val(optarg,name); check_val(optarg,name);
info->settings->use_mcast = 1; info->settings->use_mcast = 1;
@@ -467,13 +467,13 @@ static int set_option(const char *name, char *value)
nerr++; nerr++;
} }
} }
#ifdef HAVE_XINERAMA //~ #ifdef HAVE_XINERAMA
#ifndef X_DISPLAY_MISSING //~ #ifndef X_DISPLAY_MISSING
else if (strcmp(name, "xinerama") == 0 || strcmp(name, "X") == 0 ) { //~ else if (strcmp(name, "xinerama") == 0 || strcmp(name, "X") == 0 ) {
x11_user_select( atoi(optarg) ); //~ x11_user_select( atoi(optarg) );
} //~ }
#endif //~ #endif
#endif //~ #endif
else if (strcmp(name, "action-file")==0 || strcmp(name,"F")==0) { else if (strcmp(name, "action-file")==0 || strcmp(name,"F")==0) {
check_val(optarg,name); check_val(optarg,name);
veejay_strncpy(info->action_file[0],(char*) optarg, strlen( (char*) optarg)); veejay_strncpy(info->action_file[0],(char*) optarg, strlen( (char*) optarg));
@@ -559,7 +559,7 @@ static int set_option(const char *name, char *value)
{ {
info->dummy->active = 1; // enable DUMMY MODE info->dummy->active = 1; // enable DUMMY MODE
} }
else if (strcmp(name, "dynamic-fx-chain" ) == 0 || strcmp(name, "M" ) == 0 ) else if (strcmp(name, "dynamic-fx-chain" ) == 0 || strcmp(name, "X" ) == 0 )
{ {
info->uc->ram_chain = 0; info->uc->ram_chain = 0;
} }
@@ -655,12 +655,12 @@ static int check_command_line_options(int argc, char *argv[])
#ifdef HAVE_GETOPT_LONG #ifdef HAVE_GETOPT_LONG
while ((n = while ((n =
getopt_long(argc, argv, getopt_long(argc, argv,
"o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:T:F:Z:nILPVDugvBdibjqeMS:X:", "o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:T:F:Z:nILPVDugvBdibjqeM:S:X",
long_options, &option_index)) != EOF) long_options, &option_index)) != EOF)
#else #else
while ((n = while ((n =
getopt(argc, argv, getopt(argc, argv,
"o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:T:F:Z:nILPVDugvBdibjqeMS:X:" "o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:T:F:Z:nILPVDugvBdibjqeM:S:X"
)) != EOF) )) != EOF)
#endif #endif
{ {