diff options
author | GhostNaN <GhostNaN@protonmail.com> | 2020-08-06 13:27:38 -0400 |
---|---|---|
committer | GhostNaN <GhostNaN@protonmail.com> | 2020-08-06 13:27:38 -0400 |
commit | 238620504507eec74610aa01a0e933ecd3157860 (patch) | |
tree | 0a8d67dd8c2cb543b5d1d617218d9a0a47431f8c | |
parent | cdbb506ed525933064f562a0da9eb7a34040146f (diff) |
Added a verbose option
-rw-r--r-- | inc/paper.h | 2 | ||||
-rw-r--r-- | src/main.c | 15 | ||||
-rw-r--r-- | src/paper.c | 24 |
3 files changed, 36 insertions, 5 deletions
diff --git a/inc/paper.h b/inc/paper.h index a89c83c..a53ad23 100644 --- a/inc/paper.h +++ b/inc/paper.h @@ -3,6 +3,6 @@ #include <stdint.h> -void paper_init(char* monitor, char* video, char* layer_name); +void paper_init(char* monitor, char* video, int verbose, char* layer_name); #endif @@ -35,6 +35,7 @@ static void print_usage(char** argv) { printf("%s [options] <output> <url|path filename>\n", argv[0] + offset); printf("Options:\n"); printf("--help\t\t-h\tDisplays this help message\n"); + printf("--verbose\t-v\tBe more verbose\n"); printf("--fork\t\t-f\tForks mpvpaper so you can close the terminal\n"); printf("--layer\t\t-l\tSpecifies shell layer to run on (background by default)\n"); printf("--mpv-options\t-o\tForwards mpv options (Must be within quotes\"\")\n"); @@ -51,6 +52,12 @@ int main(int argc, char** argv) { .val = 'h' }, { + .name = "verbose", + .has_arg = no_argument, + .flag = NULL, + .val = 'v' + }, + { .name = "fork", .has_arg = no_argument, .flag = NULL, @@ -75,14 +82,18 @@ int main(int argc, char** argv) { .val = 0 } }; + int verbose = 0; char* layer = NULL; char* mpv_options = NULL; char opt; - while((opt = getopt_long(argc, argv, "hfl:o:", opts, NULL)) != -1) { + while((opt = getopt_long(argc, argv, "hvfl:o:", opts, NULL)) != -1) { switch(opt) { case 'h': print_usage(argv); break; + case 'v': + verbose = 1; + break; case 'f': if(fork() > 0) { exit(0); @@ -110,7 +121,7 @@ int main(int argc, char** argv) { print_usage(argv); } - paper_init(argv[optind], argv[optind + 1], layer); + paper_init(argv[optind], argv[optind + 1], verbose, layer); } else { print_usage(argv); } diff --git a/src/paper.c b/src/paper.c index 0d6fe89..48b7507 100644 --- a/src/paper.c +++ b/src/paper.c @@ -88,7 +88,7 @@ static void *get_proc_address_mpv(void *ctx, const char *name){ return eglGetProcAddress(name); } -int paper_init(char* _monitor, char* video_path, char* layer_name) { +int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name) { monitor = _monitor; wl_list_init(&outputs); struct wl_display* wl = wl_display_connect(NULL); @@ -129,6 +129,9 @@ int paper_init(char* _monitor, char* video_path, char* layer_name) { fprintf(stderr, ":/ sorry about this but we can't seem to find that output\n"); return 1; } + else if (verbose) { + printf("Connected to output %s\n", monitor); + } struct wl_surface* wl_surface = wl_compositor_create_surface(comp); @@ -154,6 +157,15 @@ int paper_init(char* _monitor, char* video_path, char* layer_name) { } else { layer = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; } + if (verbose) { + if (layer_name == NULL) { + printf("Shell layer background set\n"); + } + else { + printf("Shell layer %s set\n", layer_name); + } + } + struct zwlr_layer_surface_v1* surface = zwlr_layer_shell_v1_get_layer_surface(shell, wl_surface, output->output, layer, "mpvpaper"); struct zwlr_layer_surface_v1_listener surface_listener = { .closed = nop, @@ -196,7 +208,9 @@ int paper_init(char* _monitor, char* video_path, char* layer_name) { }; egl_ctx = eglCreateContext(egl_display, config, EGL_NO_CONTEXT, ctx_attrib); if (egl_ctx) { - printf("OpenGL %i.%i context loaded\n", gl_versions[i].major, gl_versions[i].minor); + if (verbose) { + printf("OpenGL %i.%i EGL context loaded\n", gl_versions[i].major, gl_versions[i].minor); + } break; } } @@ -242,6 +256,9 @@ int paper_init(char* _monitor, char* video_path, char* layer_name) { // Play this file. const char* cmd[] = {"loadfile", video_path, NULL}; mpv_command_async(mpv, 0, cmd); + if (verbose) { + printf("Loading %s\n", video_path); + } mpv_render_param render_params[] = { {MPV_RENDER_PARAM_OPENGL_FBO, &(mpv_opengl_fbo){ @@ -268,6 +285,9 @@ int paper_init(char* _monitor, char* video_path, char* layer_name) { break; } + if (verbose) { + printf("Exiting\n"); + } mpv_render_context_free(mpv_gl); mpv_detach_destroy(mpv); |