From 762222679780e38d2fbbbcd10d23e3afc645225e Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Wed, 8 Jan 2014 13:40:35 -0500
Subject: [PATCH] Minor changes to get SerialInput to compile on Linux
---
Source/Processors/Editors/SerialInputEditor.cpp | 2 +-
Source/Processors/SerialInput.cpp | 1 +
Source/Processors/SerialInput.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Source/Processors/Editors/SerialInputEditor.cpp b/Source/Processors/Editors/SerialInputEditor.cpp
index a9d802bbb..836e38872 100644
--- a/Source/Processors/Editors/SerialInputEditor.cpp
+++ b/Source/Processors/Editors/SerialInputEditor.cpp
@@ -53,7 +53,7 @@ SerialInputEditor::SerialInputEditor(SerialInput* parentNode)
for (int i = 0; i < baudrates.size(); i++)
{
- baudrateList->addItem(std::to_string(baudrates[i]), baudrates[i]);
+ baudrateList->addItem(String(baudrates[i]), baudrates[i]);
}
addAndMakeVisible(baudrateList);
diff --git a/Source/Processors/SerialInput.cpp b/Source/Processors/SerialInput.cpp
index 2c68d73ef..904e8e099 100644
--- a/Source/Processors/SerialInput.cpp
+++ b/Source/Processors/SerialInput.cpp
@@ -30,6 +30,7 @@ const int SerialInput::BAUDRATES[12] = {300, 1200, 2400, 4800, 9600, 14400, 1920
SerialInput::SerialInput()
: GenericProcessor("Serial Port")
{
+ baudrate = 0;
// ToDo: One day, this should use the Parameter class, and it will look roughly like this:
//parameters.add(Parameter("device", varArray(getDevices()), 0, 0, true));
//parameters.add(Parameter("baudrate", varArray(getBaudrates()), 6, 1, true));
diff --git a/Source/Processors/SerialInput.h b/Source/Processors/SerialInput.h
index c22722c3d..9aee1baec 100644
--- a/Source/Processors/SerialInput.h
+++ b/Source/Processors/SerialInput.h
@@ -119,7 +119,7 @@ private:
string device;
// The baudrate to be used
- int baudrate = 0;
+ int baudrate;
// List of baudrates that are available by default.
static const int BAUDRATES[12];
--
GitLab