diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
commit | c2ca7be5a751879159f3cb591a64bb9568b79762 (patch) | |
tree | 04e38d4f4a2aad4d789bda0a65b7abb80a3439a2 /spectro/madvrwin.c | |
parent | 45c152c326d87478fbf41714b4b8e2f7b57a282b (diff) | |
parent | 3db384424bd7398ffbb7a355cab8f15f3add009f (diff) |
Updated version 1.9.1+repack from 'upstream/1.9.1+repack'
with Debian dir 98a996367aa69ae41accf9c6d369f600bc94de80
Diffstat (limited to 'spectro/madvrwin.c')
-rw-r--r-- | spectro/madvrwin.c | 20 |
1 files changed, 15 insertions, 5 deletions
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; |