projects / packages / vlc.git / blame
| Commit | Line | Data |
|---|---|---|
| 430b3ef5 JB |
1 | --- vlc-3.0.8/configure.ac.orig 2020-04-04 18:40:34.309627852 +0200 |
| 2 | +++ vlc-3.0.8/configure.ac 2020-04-04 20:20:07.460601850 +0200 | |
| 3 | @@ -3992,12 +3992,17 @@ | |
| 4 | [ --enable-vsxu Vovoid VSXu visualization plugin (default auto)]) | |
| 5 | AS_IF([test "${enable_vsxu}" != "no"], | |
| 6 | [ | |
| 7 | + PKG_CHECK_MODULES(VSXU, libvsx, | |
| 8 | + [ | |
| 9 | + VLC_ADD_PLUGIN([vsxu]) | |
| 10 | + ],[ | |
| 11 | PKG_CHECK_MODULES(VSXU, libvsxu, | |
| 12 | [ | |
| 13 | VLC_ADD_PLUGIN([vsxu]) | |
| 14 | ],[ | |
| 15 | AC_MSG_WARN([${VSXU_PKG_ERRORS}.]) | |
| 16 | ]) | |
| 17 | + ]) | |
| 18 | ]) | |
| 19 | ||
| 20 | EXTEND_HELP_STRING([Service Discovery plugins:]) | |
| 21 | --- vlc-3.0.8/modules/visualization/vsxu.cpp.orig 2017-11-24 16:29:18.000000000 +0100 | |
| 22 | +++ vlc-3.0.8/modules/visualization/vsxu.cpp 2020-04-05 09:52:51.529757549 +0200 | |
| 23 | @@ -37,8 +37,14 @@ | |
| 24 | #include <vlc_filter.h> | |
| 25 | ||
| 26 | // vsxu manager include | |
| 27 | +#include <vsx_version.h> | |
| 28 | +#if (VSXU_VERSION_MAJOR == 0) && (VSXU_VERSION_MINOR < 6) | |
| 29 | #include <vsx_manager.h> | |
| 30 | #include <logo_intro.h> | |
| 31 | +#else | |
| 32 | +#include <vsx_state_manager.h> | |
| 33 | +#include <vsx_logo_intro.h> | |
| 34 | +#endif | |
| 35 | ||
| 36 | // class to handle cyclic buffer | |
| 37 | #include "cyclic_buffer.h" | |
| 38 | @@ -236,7 +242,11 @@ | |
| 39 | vlc_gl_t *gl = p_sys->gl; | |
| 40 | ||
| 41 | // our abstract manager holder | |
| 42 | +#if (VSXU_VERSION_MAJOR == 0) && (VSXU_VERSION_MINOR < 6) | |
| 43 | vsx_manager_abs* manager = 0; | |
| 44 | +#else | |
| 45 | + vsx::engine::audiovisual::state_manager manager; | |
| 46 | +#endif | |
| 47 | ||
| 48 | // temp audio buffer for sending to vsxu through manager | |
| 49 | float f_sample_buf[512]; | |
| 50 | @@ -277,11 +287,13 @@ | |
| 51 | // only run this once | |
| 52 | first = false; | |
| 53 | ||
| 54 | +#if (VSXU_VERSION_MAJOR == 0) && (VSXU_VERSION_MINOR < 6) | |
| 55 | // create a new manager | |
| 56 | manager = manager_factory(); | |
| 57 | ||
| 58 | // init manager with the shared path and sound input type. | |
| 59 | manager->init( 0, "media_player" ); | |
| 60 | +#endif | |
| 61 | ||
| 62 | // only show logo once | |
| 63 | // keep track of iterations | |
| 64 | @@ -299,11 +311,19 @@ | |
| 65 | memcpy( &f_sample_buf[0], (void*)(&bh->data[0]), sizeof(float) * 512 ); | |
| 66 | vlc_mutex_unlock( &p_sys->cyclic_block_mutex ); | |
| 67 | ||
| 68 | +#if (VSXU_VERSION_MAJOR == 0) && (VSXU_VERSION_MINOR < 6) | |
| 69 | // send sound pointer to vsxu | |
| 70 | manager->set_sound_wave( &f_sample_buf[0] ); | |
| 71 | ||
| 72 | // render vsxu engine | |
| 73 | if (manager) manager->render(); | |
| 74 | +#else | |
| 75 | + // send sound pointer to vsxu | |
| 76 | + manager.set_sound_wave( &f_sample_buf[0] ); | |
| 77 | + | |
| 78 | + // render vsxu engine | |
| 79 | + manager.render(); | |
| 80 | +#endif | |
| 81 | ||
| 82 | // render intro | |
| 83 | if (intro) intro->draw(); | |
| 84 | @@ -312,11 +332,15 @@ | |
| 85 | vlc_gl_Swap( gl ); | |
| 86 | } | |
| 87 | ||
| 88 | +#if (VSXU_VERSION_MAJOR == 0) && (VSXU_VERSION_MINOR < 6) | |
| 89 | // stop vsxu nicely (unloads textures and frees memory) | |
| 90 | if (manager) manager->stop(); | |
| 91 | ||
| 92 | // call manager factory to destruct our manager object | |
| 93 | if (manager) manager_destroy( manager ); | |
| 94 | +#else | |
| 95 | + manager.stop(); | |
| 96 | +#endif | |
| 97 | ||
| 98 | // delete the intro (if ever allocated) | |
| 99 | if (intro) delete intro; |