mirror of
https://github.com/jojo61/vdr-plugin-softhdcuvid.git
synced 2023-10-10 13:37:41 +02:00
Mangle with C and C++
This commit is contained in:
parent
05c2585238
commit
a424a57036
@ -61,7 +61,7 @@ extern "C"
|
||||
/// vdr-plugin version number.
|
||||
/// Makefile extracts the version number for generating the file name
|
||||
/// for the distribution archive.
|
||||
static const char *const VERSION = "3.2.1"
|
||||
static const char *const VERSION = "3.2.2"
|
||||
#ifdef GIT_REV
|
||||
"-GIT" GIT_REV
|
||||
#endif
|
||||
@ -112,7 +112,6 @@ static int ConfigScalerTest; /// Test for Scalers
|
||||
static int ConfigColorBlindness;
|
||||
static int ConfigColorBlindnessFaktor;
|
||||
|
||||
|
||||
/// config deinterlace
|
||||
static int ConfigVideoDeinterlace[RESOLUTIONS];
|
||||
|
||||
@ -3067,7 +3066,9 @@ bool cPluginSoftHdDevice::Initialize(void)
|
||||
{
|
||||
// dsyslog("[softhddev]%s:\n", __FUNCTION__);
|
||||
#if defined PLACEBO
|
||||
MyConfigDir = cPlugin::ConfigDirectory("shaders");
|
||||
const char *d;
|
||||
d = cPlugin::ConfigDirectory("shaders");
|
||||
strcpy(MyConfigDir,d);
|
||||
#endif
|
||||
MyDevice = new cSoftHdDevice();
|
||||
|
||||
|
6
video.c
6
video.c
@ -448,7 +448,7 @@ static int VideoColorBlindness = 0;
|
||||
static float VideoColorBlindnessFaktor = 1.0f;
|
||||
|
||||
static char* shadersp[NUM_SHADERS];
|
||||
const char *MyConfigDir;
|
||||
char MyConfigDir[200];
|
||||
static int num_shaders = 0;
|
||||
|
||||
static xcb_atom_t WmDeleteWindowAtom; ///< WM delete message atom
|
||||
@ -3579,12 +3579,12 @@ parse_user_shader(char *shader)
|
||||
char *str = NULL;
|
||||
|
||||
// Debug(3,"Parse user shader %s/%s\n",MyConfigDir,shader);
|
||||
|
||||
|
||||
sprintf(tmp,"%s/%s",MyConfigDir,shader);
|
||||
FILE *f = fopen(tmp, "rb");
|
||||
|
||||
if (!f) {
|
||||
Debug(3, "Failed to open shader file %s: %s\n", shader, strerror(errno));
|
||||
Debug(3, "Failed to open shader file %s: %s\n", tmp, strerror(errno));
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
2
video.h
2
video.h
@ -44,7 +44,7 @@ extern signed char VideoHardwareDecoder; ///< flag use hardware decoder
|
||||
extern char VideoIgnoreRepeatPict; ///< disable repeat pict warning
|
||||
extern int VideoAudioDelay; ///< audio/video delay
|
||||
extern char ConfigStartX11Server; ///< flag start the x11 server
|
||||
extern const char* MyConfigDir;
|
||||
extern char MyConfigDir[];
|
||||
//----------------------------------------------------------------------------
|
||||
// Prototypes
|
||||
//----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user