Rename all InputProto and OutputProtos for clarity.

arch/aeslanier/aeslanier.h

@@ -7,12 +7,12 @@
 
 class Sector;
 class Fluxmap;
-class AesLanierInputProto;
+class AesLanierDecoderProto;
 
 class AesLanierDecoder : public AbstractDecoder
 {
 public:
-	AesLanierDecoder(const AesLanierInputProto&) {}
+	AesLanierDecoder(const AesLanierDecoderProto&) {}
     virtual ~AesLanierDecoder() {}
 
     RecordType advanceToNextRecord();

arch/aeslanier/aeslanier.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message AesLanierInputProto {}
+message AesLanierDecoderProto {}
 

arch/amiga/amiga.h

@@ -12,13 +12,13 @@
 class Sector;
 class Fluxmap;
 class SectorSet;
-class AmigaInputProto;
-class AmigaOutputProto;
+class AmigaDecoderProto;
+class AmigaEncoderProto;
 
 class AmigaDecoder : public AbstractDecoder
 {
 public:
-	AmigaDecoder(const AmigaInputProto&) {}
+	AmigaDecoder(const AmigaDecoderProto&) {}
     virtual ~AmigaDecoder() {}
 
     RecordType advanceToNextRecord();
@@ -30,7 +30,7 @@ public:
 class AmigaEncoder : public AbstractEncoder
 {
 public:
-	AmigaEncoder(const AmigaOutputProto& config):
+	AmigaEncoder(const AmigaEncoderProto& config):
 		_config(config) {}
 	virtual ~AmigaEncoder() {}
 
@@ -38,7 +38,7 @@ public:
     std::unique_ptr<Fluxmap> encode(int physicalTrack, int physicalSide, const SectorSet& allSectors);
 
 private:
-	const AmigaOutputProto& _config;
+	const AmigaEncoderProto& _config;
 };
 
 extern uint32_t amigaChecksum(const Bytes& bytes);

arch/amiga/amiga.proto

@@ -2,9 +2,9 @@ syntax = "proto2";
 
 import "lib/common.proto";
 
-message AmigaInputProto {}
+message AmigaDecoderProto {}
 
-message AmigaOutputProto {
+message AmigaEncoderProto {
 	optional double clock_rate_us = 1
 		[default=2.00, (help)="Encoded data clock rate."];
 	optional double post_index_gap_ms = 2

arch/apple2/apple2.h

@@ -9,12 +9,12 @@
 
 class Sector;
 class Fluxmap;
-class Apple2InputProto;
+class Apple2DecoderProto;
 
 class Apple2Decoder : public AbstractDecoder
 {
 public:
-	Apple2Decoder(const Apple2InputProto&) {}
+	Apple2Decoder(const Apple2DecoderProto&) {}
     virtual ~Apple2Decoder() {}
 
     RecordType advanceToNextRecord();

arch/apple2/apple2.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message Apple2InputProto {}
+message Apple2DecoderProto {}
 

arch/brother/brother.h

@@ -16,13 +16,13 @@
 class Sector;
 class SectorSet;
 class Fluxmap;
-class BrotherInputProto;
-class BrotherOutputProto;
+class BrotherDecoderProto;
+class BrotherEncoderProto;
 
 class BrotherDecoder : public AbstractDecoder
 {
 public:
-    BrotherDecoder(const BrotherInputProto& config) {}
+    BrotherDecoder(const BrotherDecoderProto& config) {}
     virtual ~BrotherDecoder() {}
 
     RecordType advanceToNextRecord();
@@ -33,14 +33,14 @@ public:
 class BrotherEncoder : public AbstractEncoder
 {
 public:
-	BrotherEncoder(const BrotherOutputProto& config):
+	BrotherEncoder(const BrotherEncoderProto& config):
 		_config(config)
 	{}
 
 	virtual ~BrotherEncoder() {}
 
 private:
-	const BrotherOutputProto& _config;
+	const BrotherEncoderProto& _config;
 
 public:
     std::unique_ptr<Fluxmap> encode(int physicalTrack, int physicalSide, const SectorSet& allSectors);

arch/brother/brother.proto

@@ -1,13 +1,13 @@
 syntax = "proto2";
 
-message BrotherInputProto {}
+message BrotherDecoderProto {}
 
 enum BrotherFormat {
 	BROTHER240 = 0;
 	BROTHER120 = 1;
 };
 
-message BrotherOutputProto {
+message BrotherEncoderProto {
 	optional double clock_rate_us = 1 [default = 3.83];
 	optional double post_index_gap_ms = 2 [default = 1.0];
 	optional double sector_spacing_ms = 3 [default = 16.2];

arch/c64/c64.h

@@ -7,12 +7,12 @@
 
 class Sector;
 class Fluxmap;
-class Commodore64InputProto;
+class Commodore64DecoderProto;
 
 class Commodore64Decoder : public AbstractDecoder
 {
 public:
-	Commodore64Decoder(const Commodore64InputProto&) {}
+	Commodore64Decoder(const Commodore64DecoderProto&) {}
     virtual ~Commodore64Decoder() {}
 
     RecordType advanceToNextRecord();

arch/c64/c64.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message Commodore64InputProto {}
+message Commodore64DecoderProto {}
 

arch/f85/f85.h

@@ -7,12 +7,12 @@
 
 class Sector;
 class Fluxmap;
-class F85InputProto;
+class F85DecoderProto;
 
 class DurangoF85Decoder : public AbstractDecoder
 {
 public:
-	DurangoF85Decoder(const F85InputProto&) {}
+	DurangoF85Decoder(const F85DecoderProto&) {}
     virtual ~DurangoF85Decoder() {}
 
     RecordType advanceToNextRecord();

arch/f85/f85.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message F85InputProto {}
+message F85DecoderProto {}
 

arch/fb100/fb100.h

@@ -8,12 +8,12 @@
 class Sector;
 class Fluxmap;
 class Track;
-class Fb100InputProto;
+class Fb100DecoderProto;
 
 class Fb100Decoder : public AbstractDecoder
 {
 public:
-	Fb100Decoder(const Fb100InputProto&) {}
+	Fb100Decoder(const Fb100DecoderProto&) {}
     virtual ~Fb100Decoder() {}
 
     RecordType advanceToNextRecord();

arch/fb100/fb100.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message Fb100InputProto {}
+message Fb100DecoderProto {}
 

arch/ibm/ibm.h

@@ -4,8 +4,8 @@
 #include "decoders/decoders.h"
 #include "encoders/encoders.h"
 
-class IBMInputProto;
-class IBMOutputProto;
+class IbmDecoderProto;
+class IbmEncoderProto;
 
 /* IBM format (i.e. ordinary PC floppies). */
 
@@ -35,7 +35,7 @@ struct IbmIdam
 class IbmDecoder : public AbstractDecoder
 {
 public:
-    IbmDecoder(const IBMInputProto& config):
+    IbmDecoder(const IbmDecoderProto& config):
 		_config(config)
     {}
 
@@ -46,7 +46,7 @@ public:
 	std::set<unsigned> requiredSectors(Track& track) const;
 
 private:
-	const IBMInputProto& _config;
+	const IbmDecoderProto& _config;
     unsigned _currentSectorSize;
     unsigned _currentHeaderLength;
 };
@@ -54,7 +54,7 @@ private:
 class IbmEncoder : public AbstractEncoder
 {
 public:
-	IbmEncoder(const IBMOutputProto& config):
+	IbmEncoder(const IbmEncoderProto& config):
 		_config(config)
 	{}
 
@@ -70,7 +70,7 @@ private:
 	void writeSync();
 	
 private:
-	const IBMOutputProto& _config;
+	const IbmEncoderProto& _config;
 	std::vector<bool> _bits;
 	unsigned _cursor;
 	bool _lastBit;

arch/ibm/ibm.proto

@@ -2,7 +2,7 @@ syntax = "proto2";
 
 import "lib/common.proto";
 
-message IBMInputProto {
+message IbmDecoderProto {
 	optional int32 sector_id_base = 1 [default = 1,
 		(help) = "ID of first sector"];
 	optional bool ignore_side_byte = 2 [default = false,
@@ -11,7 +11,7 @@ message IBMInputProto {
 		(help) = "require these sectors to exist for a good read"];
 }
 
-message IBMOutputProto {
+message IbmEncoderProto {
 	optional double track_length_ms = 1;
 	optional int32 sector_size = 2 [default=512];
 	optional bool emit_iam = 3 [default=true];

arch/macintosh/macintosh.h

@@ -15,13 +15,13 @@
 
 class Sector;
 class Fluxmap;
-class MacintoshInputProto;
-class MacintoshOutputProto;
+class MacintoshDecoderProto;
+class MacintoshEncoderProto;
 
 class MacintoshDecoder : public AbstractDecoder
 {
 public:
-	MacintoshDecoder(const MacintoshInputProto&) {}
+	MacintoshDecoder(const MacintoshDecoderProto&) {}
     virtual ~MacintoshDecoder() {}
 
     RecordType advanceToNextRecord();
@@ -34,7 +34,7 @@ public:
 class MacintoshEncoder : public AbstractEncoder
 {
 public:
-	MacintoshEncoder(const MacintoshOutputProto&) {}
+	MacintoshEncoder(const MacintoshEncoderProto&) {}
 	virtual ~MacintoshEncoder() {}
 
 public:

arch/macintosh/macintosh.proto

@@ -1,5 +1,5 @@
 syntax = "proto2";
 
-message MacintoshInputProto {}
-message MacintoshOutputProto {}
+message MacintoshDecoderProto {}
+message MacintoshEncoderProto {}
 

arch/micropolis/micropolis.h

@@ -5,12 +5,12 @@
 
 class Sector;
 class Fluxmap;
-class MicropolisInputProto;
+class MicropolisDecoderProto;
 
 class MicropolisDecoder : public AbstractDecoder
 {
 public:
-	MicropolisDecoder(const MicropolisInputProto&) {}
+	MicropolisDecoder(const MicropolisDecoderProto&) {}
 	virtual ~MicropolisDecoder() {}
 
 	RecordType advanceToNextRecord();

arch/micropolis/micropolis.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message MicropolisInputProto {}
+message MicropolisDecoderProto {}
 

arch/mx/mx.h

@@ -3,12 +3,12 @@
 
 #include "decoders/decoders.h"
 
-class MxInputProto;
+class MxDecoderProto;
 
 class MxDecoder : public AbstractDecoder
 {
 public:
-	MxDecoder(const MxInputProto&) {}
+	MxDecoder(const MxDecoderProto&) {}
     virtual ~MxDecoder() {}
 
     void beginTrack();

arch/mx/mx.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message MxInputProto {}
+message MxDecoderProto {}
 

arch/tids990/tids990.h

@@ -9,13 +9,13 @@ class Sector;
 class SectorSet;
 class Fluxmap;
 class Track;
-class Tids990InputProto;
-class Tids990OutputProto;
+class Tids990DecoderProto;
+class Tids990EncoderProto;
 
 class Tids990Decoder : public AbstractDecoder
 {
 public:
-	Tids990Decoder(const Tids990InputProto&) {}
+	Tids990Decoder(const Tids990DecoderProto&) {}
     virtual ~Tids990Decoder() {}
 
     RecordType advanceToNextRecord();
@@ -26,7 +26,7 @@ public:
 class Tids990Encoder : public AbstractEncoder
 {
 public:
-	Tids990Encoder(const Tids990OutputProto& config):
+	Tids990Encoder(const Tids990EncoderProto& config):
 		_config(config)
 	{}
 	virtual ~Tids990Encoder() {}
@@ -41,7 +41,7 @@ public:
     std::unique_ptr<Fluxmap> encode(int physicalTrack, int physicalSide, const SectorSet& allSectors);
 
 private:
-	const Tids990OutputProto& _config;
+	const Tids990EncoderProto& _config;
 	std::vector<bool> _bits;
 	unsigned _cursor;
 	bool _lastBit;

arch/tids990/tids990.proto

@@ -2,8 +2,8 @@ syntax = "proto2";
 
 import "lib/common.proto";
 
-message Tids990InputProto {}
-message Tids990OutputProto {
+message Tids990DecoderProto {}
+message Tids990EncoderProto {
 	optional double track_length_ms = 1 [ default = 166,
 		(help) = "length of a track" ];
 	optional int32 sector_count = 2 [ default = 26,

arch/victor9k/victor9k.h

@@ -8,12 +8,12 @@
 
 class Sector;
 class Fluxmap;
-class Victor9kInputProto;
+class Victor9kDecoderProto;
 
 class Victor9kDecoder : public AbstractDecoder
 {
 public:
-	Victor9kDecoder(const Victor9kInputProto&) {}
+	Victor9kDecoder(const Victor9kDecoderProto&) {}
     virtual ~Victor9kDecoder() {}
 
     RecordType advanceToNextRecord();

arch/zilogmcz/zilogmcz.h

@@ -3,12 +3,12 @@
 
 class Sector;
 class Fluxmap;
-class ZilogMczInputProto;
+class ZilogMczDecoderProto;
 
 class ZilogMczDecoder : public AbstractDecoder
 {
 public:
-	ZilogMczDecoder(const ZilogMczInputProto&) {}
+	ZilogMczDecoder(const ZilogMczDecoderProto&) {}
     virtual ~ZilogMczDecoder() {}
 
     RecordType advanceToNextRecord();

arch/zilogmcz/zilogmcz.proto

@@ -1,4 +1,4 @@
 syntax = "proto2";
 
-message ZilogMczInputProto {}
+message ZilogMczDecoderProto {}
 

lib/decoders/decoders.proto

@@ -27,20 +27,20 @@ message DecoderProto {
 		(help) = "refuse to detect clocks shorter than this, to avoid false positives"];
 
 	oneof format {
-		IBMInputProto ibm = 5;
-		BrotherInputProto brother = 6;
-		AesLanierInputProto aeslanier = 7;
-		AmigaInputProto amiga = 8;
-		Commodore64InputProto c64 = 9;
-		F85InputProto f85 = 10;
-		Fb100InputProto fb100 = 11;
-		MacintoshInputProto macintosh = 12;
-		Apple2InputProto apple2 = 13;
-		MicropolisInputProto micropolis = 14;
-		MxInputProto mx = 15;
-		Tids990InputProto tids990 = 16;
-		Victor9kInputProto victor9k = 17;
-		ZilogMczInputProto zilogmcz = 18;
+		IbmDecoderProto ibm = 5;
+		BrotherDecoderProto brother = 6;
+		AesLanierDecoderProto aeslanier = 7;
+		AmigaDecoderProto amiga = 8;
+		Commodore64DecoderProto c64 = 9;
+		F85DecoderProto f85 = 10;
+		Fb100DecoderProto fb100 = 11;
+		MacintoshDecoderProto macintosh = 12;
+		Apple2DecoderProto apple2 = 13;
+		MicropolisDecoderProto micropolis = 14;
+		MxDecoderProto mx = 15;
+		Tids990DecoderProto tids990 = 16;
+		Victor9kDecoderProto victor9k = 17;
+		ZilogMczDecoderProto zilogmcz = 18;
 	}
 }
 

lib/encoders/encoders.proto

@@ -9,10 +9,10 @@ import "arch/tids990/tids990.proto";
 
 message EncoderProto {
 	oneof format {
-		IBMOutputProto ibm = 3;
-		BrotherOutputProto brother = 4;
-		AmigaOutputProto amiga = 5;
-		MacintoshOutputProto macintosh = 6;
-		Tids990OutputProto tids990 = 7;
+		IbmEncoderProto ibm = 3;
+		BrotherEncoderProto brother = 4;
+		AmigaEncoderProto amiga = 5;
+		MacintoshEncoderProto macintosh = 6;
+		Tids990EncoderProto tids990 = 7;
 	}
 }