--- np2/macosx/commng.cpp 2003/11/28 17:44:19 1.3 +++ np2/macosx/commng.cpp 2004/03/02 23:23:06 1.5 @@ -1,7 +1,8 @@ #include "compiler.h" +#include "np2.h" #include "commng.h" -#include "cmver.h" - +#include "cmjasts.h" +#include "cmmidi.h" // ---- non connect @@ -44,16 +45,33 @@ static const _COMMNG com_nc = { void commng_initialize(void) { - cmvermouth_initialize(); + cmmidi_initailize(); } COMMNG commng_create(UINT device) { COMMNG ret; - + COMCFG* cfg; + ret = NULL; - if (device == COMCREATE_MPU98II) { - ret = cmvermouth_create(); + switch(device) { + case COMCREATE_PRINTER: + if (np2oscfg.jastsnd) { + ret = cmjasts_create(); + } + break; + + case COMCREATE_MPU98II: + cfg = &np2oscfg.mpu;; + ret = cmmidi_create(cfg->mout, cfg->min, cfg->mdl); + if (ret) { + ret->msg(ret, COMMSG_MIMPIDEFFILE, (long)cfg->def); + ret->msg(ret, COMMSG_MIMPIDEFEN, (long)cfg->def_en); + } + break; + + default: + break; } if (ret == NULL) { ret = (COMMNG)&com_nc;