Victor9k no longer uses collectSectors().

Author: davidgiven

arch/victor9k/encoder.cc

@@ -163,26 +163,6 @@ class Victor9kEncoder : public Encoder
     }
 
 public:
-    std::vector<std::shared_ptr<const Sector>> collectSectors(
-        const Location& location, const Image& image) override
-    {
-        std::vector<std::shared_ptr<const Sector>> sectors;
-
-        Victor9kEncoderProto::TrackdataProto trackdata;
-        getTrackFormat(trackdata, location.logicalTrack, location.head);
-
-        for (int i = 0; i < trackdata.sector_range().sector_count(); i++)
-        {
-            int sectorId = trackdata.sector_range().start_sector() + i;
-            const auto& sector =
-                image.get(location.logicalTrack, location.head, sectorId);
-            if (sector)
-                sectors.push_back(sector);
-        }
-
-        return sectors;
-    }
-
     std::unique_ptr<Fluxmap> encode(const Location& location,
         const std::vector<std::shared_ptr<const Sector>>& sectors,
         const Image& image) override

arch/victor9k/victor9k.proto

@@ -9,14 +9,6 @@ message Victor9kEncoderProto
 {
     message TrackdataProto
     {
-        message SectorRangeProto
-        {
-            optional int32 start_sector = 1
-                [ (help) = "first sector ID on track" ];
-            optional int32 sector_count = 2
-                [ (help) = "number of sectors on track" ];
-        }
-
         optional int32 min_track = 1
             [ (help) = "minimum track this format applies to" ];
         optional int32 max_track = 2
@@ -38,9 +30,6 @@ message Victor9kEncoderProto
             [ (help) = "size of gap between data and the next header" ];
         optional int32 post_header_gap_bits = 11
             [ (help) = "size of gap between header and the data" ];
-
-        optional SectorRangeProto sector_range = 7
-            [ (help) = "write these sectors on each track" ];
     }
 
     repeated TrackdataProto trackdata = 1;

src/formats/victor9k_ds.textpb

@@ -164,146 +164,96 @@ encoder {
 			min_track: 0
 			max_track: 3
 			rotational_period_ms: 237.9
-			sector_range {
-				start_sector: 0
-				sector_count: 19
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 4
 			max_track: 15
 			rotational_period_ms: 224.5
-			sector_range {
-				sector_count: 18
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 16
 			max_track: 26
 			rotational_period_ms: 212.2
-			sector_range {
-				sector_count: 17
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 27
 			max_track: 37
 			rotational_period_ms: 199.9
-			sector_range {
-				sector_count: 16
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 38
 			max_track: 47
 			rotational_period_ms: 187.6
-			sector_range {
-				sector_count: 15
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 48
 			max_track: 59
 			rotational_period_ms: 175.3
-			sector_range {
-				sector_count: 14
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 60
 			max_track: 70
 			rotational_period_ms: 163.0
-			sector_range {
-				sector_count: 13
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 71
 			max_track: 79
 			rotational_period_ms: 149.6
-			sector_range {
-				sector_count: 12
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 0
 			max_track: 7
 			rotational_period_ms: 224.5
-			sector_range {
-				start_sector: 0
-				sector_count: 18
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 8
 			max_track: 18
 			rotational_period_ms: 212.2
-			sector_range {
-				sector_count: 17
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 19
 			max_track: 29
 			rotational_period_ms: 199.9
-			sector_range {
-				sector_count: 16
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 30
 			max_track: 39
 			rotational_period_ms: 187.6
-			sector_range {
-				sector_count: 15
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 40
 			max_track: 51
 			rotational_period_ms: 175.3
-			sector_range {
-				sector_count: 14
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 52
 			max_track: 62
 			rotational_period_ms: 163.0
-			sector_range {
-				sector_count: 13
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 63
 			max_track: 74
 			rotational_period_ms: 149.6
-			sector_range {
-				sector_count: 12
-			}
 		}
 		trackdata {
 			head: 1
 			min_track: 75
 			max_track: 79
 			rotational_period_ms: 144.0
-			sector_range {
-				sector_count: 11
-			}
 		}
 	}
 }

src/formats/victor9k_ss.textpb

@@ -127,73 +127,48 @@ encoder {
 			min_track: 0
 			max_track: 3
 			rotational_period_ms: 237.9
-			sector_range {
-				start_sector: 0
-				sector_count: 19
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 4
 			max_track: 15
 			rotational_period_ms: 224.5
-			sector_range {
-				sector_count: 18
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 16
 			max_track: 26
 			rotational_period_ms: 212.2
-			sector_range {
-				sector_count: 17
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 27
 			max_track: 37
 			rotational_period_ms: 199.9
-			sector_range {
-				sector_count: 16
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 38
 			max_track: 47
 			rotational_period_ms: 187.6
-			sector_range {
-				sector_count: 15
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 48
 			max_track: 59
 			rotational_period_ms: 175.3
-			sector_range {
-				sector_count: 14
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 60
 			max_track: 70
 			rotational_period_ms: 163.0
-			sector_range {
-				sector_count: 13
-			}
 		}
 		trackdata {
 			head: 0
 			min_track: 71
 			max_track: 79
 			rotational_period_ms: 149.6
-			sector_range {
-				sector_count: 12
-			}
 		}
 	}
 }