salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename all protos to end with 'Proto' to avoid name conflicts.

Browse Source
This commit is contained in:
David Given
2021-05-13 18:05:08 +02:00
parent 639588fa68
commit 5a186b6960
37 changed files with 162 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/encoders/encoders.cc
View File

@@ -7,14 +7,14 @@
#include "lib/encoders/encoders.pb.h"
#include "protocol.h"
std::unique_ptr<AbstractEncoder> AbstractEncoder::create(const Encoder& config)
std::unique_ptr<AbstractEncoder> AbstractEncoder::create(const EncoderProto& config)
{
switch (config.format_case())
{
case Encoder::kIbm:
case EncoderProto::kIbm:
return std::unique_ptr<AbstractEncoder>(new IbmEncoder(config.ibm()));
case Encoder::kBrother:
case EncoderProto::kBrother:
return std::unique_ptr<AbstractEncoder>(new BrotherEncoder(config.brother()));
default:

4
lib/encoders/encoders.h
View File

@@ -3,14 +3,14 @@
class Fluxmap;
class SectorSet;
class Encoder;
class EncoderProto;
class AbstractEncoder
{
public:
virtual ~AbstractEncoder() {}
static std::unique_ptr<AbstractEncoder> create(const Encoder& config);
static std::unique_ptr<AbstractEncoder> create(const EncoderProto& config);
public:
virtual std::unique_ptr<Fluxmap> encode(

6
lib/encoders/encoders.proto
View File

@@ -4,9 +4,9 @@ import "arch/brother/brother.proto";
import "arch/ibm/ibm.proto";
//import "lib/common.proto";
message Encoder {
message EncoderProto {
oneof format {
IBMOutput ibm = 3;
BrotherOutput brother = 4;
IBMOutputProto ibm = 3;
BrotherOutputProto brother = 4;
}
}