From 9f6c9d96eff1d905d9779de518d1a2e92c0b012e Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 27 Sep 2014 00:31:28 +0100 Subject: [PATCH] Carla: Misc fixing --- plugins/carlabase/carla.cpp | 3 +-- plugins/carlabase/carla.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/carlabase/carla.cpp b/plugins/carlabase/carla.cpp index 5b590e012..81f724473 100644 --- a/plugins/carlabase/carla.cpp +++ b/plugins/carlabase/carla.cpp @@ -46,7 +46,6 @@ static const double ticksPerBeat = 48.0; /* * Current TODO items: * - get plugin instance name (to use in external window title) - * - buffer-size change callback * - offline mode change callback * - midi output * - background artwork @@ -330,7 +329,7 @@ void CarlaInstrument::play(sampleFrame* workingBuffer) song* const s = engine::getSong(); fTimeInfo.playing = s->isPlaying(); fTimeInfo.frame = s->getPlayPos(s->playMode()).frames(engine::framesPerTick()); - fTimeInfo.usecs = s->getMilliseconds()/1000; + fTimeInfo.usecs = s->getMilliseconds()*1000; fTimeInfo.bbt.bar = s->getTacts() + 1; fTimeInfo.bbt.beat = s->getBeat() + 1; fTimeInfo.bbt.tick = s->getBeatTicks(); diff --git a/plugins/carlabase/carla.h b/plugins/carlabase/carla.h index f53f16c74..e809c001a 100644 --- a/plugins/carlabase/carla.h +++ b/plugins/carlabase/carla.h @@ -22,8 +22,8 @@ * */ -#ifndef _CARLA_H -#define _CARLA_H +#ifndef CARLA_H +#define CARLA_H #include "CarlaNative.h"