From 3db384424bd7398ffbb7a355cab8f15f3add009f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2016 19:24:58 +0200 Subject: New upstream version 1.9.1+repack --- spectro/madvrwin.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'spectro/madvrwin.c') diff --git a/spectro/madvrwin.c b/spectro/madvrwin.c index e131e5e..305a240 100644 --- a/spectro/madvrwin.c +++ b/spectro/madvrwin.c @@ -215,8 +215,11 @@ static ramdac *madvrwin_get_ramdac(dispwin *p) { debugr("madvrwin_get_ramdac failed on malloc()\n"); return NULL; } - r->pdepth = p->pdepth; - r->nent = (1 << p->pdepth); + r->fdepth = p->fdepth; + r->rdepth = p->rdepth; + r->ndepth = p->ndepth; + r->nent = p->nent; + r->clone = dispwin_clone_ramdac; r->setlin = dispwin_setlin_ramdac; r->del = dispwin_del_ramdac; @@ -506,8 +509,15 @@ int ddebug /* >0 to print debug statements to stderr */ dispwin_set_default_delays(p); - p->pdepth = 8; /* Assume this */ - p->edepth = 16; + p->fdepth = 8; /* Assume this */ + p->rdepth = p->fdepth; /* Assumed */ + p->ndepth = p->rdepth; /* Assumed */ +#ifdef ENABLE_RAMDAC + p->nent = (1 << p->ndepth); +#else + p->nent = 0; /* No ramdac */ +#endif + p->edepth = 16; /* Assumed */ if (initMadVR(p)) { debugr2((errout,"Failed to locate MadVR .dll or functions\n")); @@ -515,7 +525,7 @@ int ddebug /* >0 to print debug statements to stderr */ return NULL; } - if (!madVR_BlindConnect(0, 1000)) { + if (!madVR_BlindConnect(1, 1000)) { debugr2((errout,"Failed to connect to MadVR\n")); free(p); return NULL; -- cgit v1.2.3