diff --git a/main/src/infrastructure/proto/generated.rs b/main/src/infrastructure/proto/generated.rs index ef332848..83a90ee1 100644 --- a/main/src/infrastructure/proto/generated.rs +++ b/main/src/infrastructure/proto/generated.rs @@ -116,7 +116,9 @@ pub mod command_request { #[prost(message, tag = "37")] GetOccasionalGlobalUpdates(super::GetOccasionalGlobalUpdatesRequest), #[prost(message, tag = "53")] - GetOccasionalPlaytimeEngineUpdates(super::GetOccasionalPlaytimeEngineUpdatesRequest), + GetOccasionalPlaytimeEngineUpdates( + super::GetOccasionalPlaytimeEngineUpdatesRequest, + ), #[prost(message, tag = "40")] GetOccasionalInstanceUpdates(super::GetOccasionalInstanceUpdatesRequest), #[prost(message, tag = "25")] @@ -280,7 +282,9 @@ pub mod event_reply { #[prost(message, tag = "1")] OccasionalGlobalUpdatesReply(super::GetOccasionalGlobalUpdatesReply), #[prost(message, tag = "15")] - OccasionalPlaytimeEngineUpdatesReply(super::GetOccasionalPlaytimeEngineUpdatesReply), + OccasionalPlaytimeEngineUpdatesReply( + super::GetOccasionalPlaytimeEngineUpdatesReply, + ), #[prost(message, tag = "13")] OccasionalInstanceUpdatesReply(super::GetOccasionalInstanceUpdatesReply), #[prost(message, tag = "14")] @@ -1779,9 +1783,15 @@ impl TriggerInstanceAction { TriggerInstanceAction::ArrangementTogglePlayStop => { "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_TOGGLE_PLAY_STOP" } - TriggerInstanceAction::ArrangementPlay => "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_PLAY", - TriggerInstanceAction::ArrangementStop => "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_STOP", - TriggerInstanceAction::ArrangementPause => "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_PAUSE", + TriggerInstanceAction::ArrangementPlay => { + "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_PLAY" + } + TriggerInstanceAction::ArrangementStop => { + "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_STOP" + } + TriggerInstanceAction::ArrangementPause => { + "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_PAUSE" + } TriggerInstanceAction::ArrangementStartRecording => { "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_START_RECORDING" } @@ -1796,7 +1806,9 @@ impl TriggerInstanceAction { /// Creates an enum from field names used in the ProtoBuf definition. pub fn from_str_name(value: &str) -> ::core::option::Option { match value { - "TRIGGER_INSTANCE_ACTION_SHOW_HELGOBOX_PLUGIN" => Some(Self::ShowHelgoboxPlugin), + "TRIGGER_INSTANCE_ACTION_SHOW_HELGOBOX_PLUGIN" => { + Some(Self::ShowHelgoboxPlugin) + } "TRIGGER_INSTANCE_ACTION_ARRANGEMENT_TOGGLE_PLAY_STOP" => { Some(Self::ArrangementTogglePlayStop) } @@ -2136,7 +2148,9 @@ impl TriggerTrackAction { TriggerTrackAction::ToggleArm => "TRIGGER_TRACK_ACTION_TOGGLE_ARM", TriggerTrackAction::ShowFx => "TRIGGER_TRACK_ACTION_SHOW_FX", TriggerTrackAction::ShowRouting => "TRIGGER_TRACK_ACTION_SHOW_ROUTING", - TriggerTrackAction::ToggleLearnInput => "TRIGGER_TRACK_ACTION_TOGGLE_LEARN_INPUT", + TriggerTrackAction::ToggleLearnInput => { + "TRIGGER_TRACK_ACTION_TOGGLE_LEARN_INPUT" + } } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -2189,7 +2203,9 @@ impl TriggerColumnAction { "TRIGGER_COLUMN_ACTION_REMOVE_SIMPLE_MAPPING" } TriggerColumnAction::Activate => "TRIGGER_COLUMN_ACTION_ACTIVATE", - TriggerColumnAction::ExportToClipboard => "TRIGGER_COLUMN_ACTION_EXPORT_TO_CLIPBOARD", + TriggerColumnAction::ExportToClipboard => { + "TRIGGER_COLUMN_ACTION_EXPORT_TO_CLIPBOARD" + } TriggerColumnAction::ExportToArrangement => { "TRIGGER_COLUMN_ACTION_EXPORT_TO_ARRANGEMENT" } @@ -2209,10 +2225,14 @@ impl TriggerColumnAction { "TRIGGER_COLUMN_ACTION_TOGGLE_LEARN_SIMPLE_MAPPING" => { Some(Self::ToggleLearnSimpleMapping) } - "TRIGGER_COLUMN_ACTION_REMOVE_SIMPLE_MAPPING" => Some(Self::RemoveSimpleMapping), + "TRIGGER_COLUMN_ACTION_REMOVE_SIMPLE_MAPPING" => { + Some(Self::RemoveSimpleMapping) + } "TRIGGER_COLUMN_ACTION_ACTIVATE" => Some(Self::Activate), "TRIGGER_COLUMN_ACTION_EXPORT_TO_CLIPBOARD" => Some(Self::ExportToClipboard), - "TRIGGER_COLUMN_ACTION_EXPORT_TO_ARRANGEMENT" => Some(Self::ExportToArrangement), + "TRIGGER_COLUMN_ACTION_EXPORT_TO_ARRANGEMENT" => { + Some(Self::ExportToArrangement) + } _ => None, } } @@ -2252,12 +2272,16 @@ impl TriggerRowAction { TriggerRowAction::ToggleLearnSimpleMapping => { "TRIGGER_ROW_ACTION_TOGGLE_LEARN_SIMPLE_MAPPING" } - TriggerRowAction::RemoveSimpleMapping => "TRIGGER_ROW_ACTION_REMOVE_SIMPLE_MAPPING", + TriggerRowAction::RemoveSimpleMapping => { + "TRIGGER_ROW_ACTION_REMOVE_SIMPLE_MAPPING" + } TriggerRowAction::BuildSceneFromPlayingSlots => { "TRIGGER_ROW_ACTION_BUILD_SCENE_FROM_PLAYING_SLOTS" } TriggerRowAction::Activate => "TRIGGER_ROW_ACTION_ACTIVATE", - TriggerRowAction::ExportToArrangement => "TRIGGER_ROW_ACTION_EXPORT_TO_ARRANGEMENT", + TriggerRowAction::ExportToArrangement => { + "TRIGGER_ROW_ACTION_EXPORT_TO_ARRANGEMENT" + } } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -2371,18 +2395,28 @@ impl TriggerSlotAction { TriggerSlotAction::Copy => "TRIGGER_SLOT_ACTION_COPY", TriggerSlotAction::Cut => "TRIGGER_SLOT_ACTION_CUT", TriggerSlotAction::Paste => "TRIGGER_SLOT_ACTION_PASTE", - TriggerSlotAction::ImportSelectedItems => "TRIGGER_SLOT_ACTION_IMPORT_SELECTED_ITEMS", + TriggerSlotAction::ImportSelectedItems => { + "TRIGGER_SLOT_ACTION_IMPORT_SELECTED_ITEMS" + } TriggerSlotAction::Panic => "TRIGGER_SLOT_ACTION_PANIC", - TriggerSlotAction::CreateEmptyMidiClip => "TRIGGER_SLOT_ACTION_CREATE_EMPTY_MIDI_CLIP", + TriggerSlotAction::CreateEmptyMidiClip => { + "TRIGGER_SLOT_ACTION_CREATE_EMPTY_MIDI_CLIP" + } TriggerSlotAction::ToggleLearnSimpleMapping => { "TRIGGER_SLOT_ACTION_TOGGLE_LEARN_SIMPLE_MAPPING" } - TriggerSlotAction::RemoveSimpleMapping => "TRIGGER_SLOT_ACTION_REMOVE_SIMPLE_MAPPING", + TriggerSlotAction::RemoveSimpleMapping => { + "TRIGGER_SLOT_ACTION_REMOVE_SIMPLE_MAPPING" + } TriggerSlotAction::TriggerOn => "TRIGGER_SLOT_ACTION_TRIGGER_ON", TriggerSlotAction::TriggerOff => "TRIGGER_SLOT_ACTION_TRIGGER_OFF", TriggerSlotAction::Activate => "TRIGGER_SLOT_ACTION_ACTIVATE", - TriggerSlotAction::ExportToClipboard => "TRIGGER_SLOT_ACTION_EXPORT_TO_CLIPBOARD", - TriggerSlotAction::ExportToArrangement => "TRIGGER_SLOT_ACTION_EXPORT_TO_ARRANGEMENT", + TriggerSlotAction::ExportToClipboard => { + "TRIGGER_SLOT_ACTION_EXPORT_TO_CLIPBOARD" + } + TriggerSlotAction::ExportToArrangement => { + "TRIGGER_SLOT_ACTION_EXPORT_TO_ARRANGEMENT" + } } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -2395,18 +2429,26 @@ impl TriggerSlotAction { "TRIGGER_SLOT_ACTION_COPY" => Some(Self::Copy), "TRIGGER_SLOT_ACTION_CUT" => Some(Self::Cut), "TRIGGER_SLOT_ACTION_PASTE" => Some(Self::Paste), - "TRIGGER_SLOT_ACTION_IMPORT_SELECTED_ITEMS" => Some(Self::ImportSelectedItems), + "TRIGGER_SLOT_ACTION_IMPORT_SELECTED_ITEMS" => { + Some(Self::ImportSelectedItems) + } "TRIGGER_SLOT_ACTION_PANIC" => Some(Self::Panic), - "TRIGGER_SLOT_ACTION_CREATE_EMPTY_MIDI_CLIP" => Some(Self::CreateEmptyMidiClip), + "TRIGGER_SLOT_ACTION_CREATE_EMPTY_MIDI_CLIP" => { + Some(Self::CreateEmptyMidiClip) + } "TRIGGER_SLOT_ACTION_TOGGLE_LEARN_SIMPLE_MAPPING" => { Some(Self::ToggleLearnSimpleMapping) } - "TRIGGER_SLOT_ACTION_REMOVE_SIMPLE_MAPPING" => Some(Self::RemoveSimpleMapping), + "TRIGGER_SLOT_ACTION_REMOVE_SIMPLE_MAPPING" => { + Some(Self::RemoveSimpleMapping) + } "TRIGGER_SLOT_ACTION_TRIGGER_ON" => Some(Self::TriggerOn), "TRIGGER_SLOT_ACTION_TRIGGER_OFF" => Some(Self::TriggerOff), "TRIGGER_SLOT_ACTION_ACTIVATE" => Some(Self::Activate), "TRIGGER_SLOT_ACTION_EXPORT_TO_CLIPBOARD" => Some(Self::ExportToClipboard), - "TRIGGER_SLOT_ACTION_EXPORT_TO_ARRANGEMENT" => Some(Self::ExportToArrangement), + "TRIGGER_SLOT_ACTION_EXPORT_TO_ARRANGEMENT" => { + Some(Self::ExportToArrangement) + } _ => None, } } @@ -2436,12 +2478,20 @@ impl TriggerClipAction { TriggerClipAction::Edit => "TRIGGER_CLIP_ACTION_EDIT", TriggerClipAction::Remove => "TRIGGER_CLIP_ACTION_REMOVE", TriggerClipAction::Promote => "TRIGGER_CLIP_ACTION_PROMOTE", - TriggerClipAction::OpenInMediaExplorer => "TRIGGER_CLIP_ACTION_OPEN_IN_MEDIA_EXPLORER", + TriggerClipAction::OpenInMediaExplorer => { + "TRIGGER_CLIP_ACTION_OPEN_IN_MEDIA_EXPLORER" + } TriggerClipAction::Quantize => "TRIGGER_CLIP_ACTION_QUANTIZE", TriggerClipAction::Unquantize => "TRIGGER_CLIP_ACTION_UNQUANTIZE", - TriggerClipAction::ExportToClipboard => "TRIGGER_CLIP_ACTION_EXPORT_TO_CLIPBOARD", - TriggerClipAction::ExportToArrangement => "TRIGGER_CLIP_ACTION_EXPORT_TO_ARRANGEMENT", - TriggerClipAction::ToggleMidiOverdub => "TRIGGER_CLIP_ACTION_TOGGLE_MIDI_OVERDUB", + TriggerClipAction::ExportToClipboard => { + "TRIGGER_CLIP_ACTION_EXPORT_TO_CLIPBOARD" + } + TriggerClipAction::ExportToArrangement => { + "TRIGGER_CLIP_ACTION_EXPORT_TO_ARRANGEMENT" + } + TriggerClipAction::ToggleMidiOverdub => { + "TRIGGER_CLIP_ACTION_TOGGLE_MIDI_OVERDUB" + } } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -2451,11 +2501,15 @@ impl TriggerClipAction { "TRIGGER_CLIP_ACTION_EDIT" => Some(Self::Edit), "TRIGGER_CLIP_ACTION_REMOVE" => Some(Self::Remove), "TRIGGER_CLIP_ACTION_PROMOTE" => Some(Self::Promote), - "TRIGGER_CLIP_ACTION_OPEN_IN_MEDIA_EXPLORER" => Some(Self::OpenInMediaExplorer), + "TRIGGER_CLIP_ACTION_OPEN_IN_MEDIA_EXPLORER" => { + Some(Self::OpenInMediaExplorer) + } "TRIGGER_CLIP_ACTION_QUANTIZE" => Some(Self::Quantize), "TRIGGER_CLIP_ACTION_UNQUANTIZE" => Some(Self::Unquantize), "TRIGGER_CLIP_ACTION_EXPORT_TO_CLIPBOARD" => Some(Self::ExportToClipboard), - "TRIGGER_CLIP_ACTION_EXPORT_TO_ARRANGEMENT" => Some(Self::ExportToArrangement), + "TRIGGER_CLIP_ACTION_EXPORT_TO_ARRANGEMENT" => { + Some(Self::ExportToArrangement) + } "TRIGGER_CLIP_ACTION_TOGGLE_MIDI_OVERDUB" => Some(Self::ToggleMidiOverdub), _ => None, } @@ -2648,11 +2702,17 @@ impl SlotPlayState { SlotPlayState::Unknown => "SLOT_PLAY_STATE_UNKNOWN", SlotPlayState::Stopped => "SLOT_PLAY_STATE_STOPPED", SlotPlayState::Ignited => "SLOT_PLAY_STATE_IGNITED", - SlotPlayState::ScheduledForPlayStart => "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_START", + SlotPlayState::ScheduledForPlayStart => { + "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_START" + } SlotPlayState::Playing => "SLOT_PLAY_STATE_PLAYING", SlotPlayState::Paused => "SLOT_PLAY_STATE_PAUSED", - SlotPlayState::ScheduledForPlayRestart => "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_RESTART", - SlotPlayState::ScheduledForPlayStop => "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_STOP", + SlotPlayState::ScheduledForPlayRestart => { + "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_RESTART" + } + SlotPlayState::ScheduledForPlayStop => { + "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_STOP" + } SlotPlayState::ScheduledForRecordingStart => { "SLOT_PLAY_STATE_SCHEDULED_FOR_RECORDING_START" } @@ -2668,16 +2728,22 @@ impl SlotPlayState { "SLOT_PLAY_STATE_UNKNOWN" => Some(Self::Unknown), "SLOT_PLAY_STATE_STOPPED" => Some(Self::Stopped), "SLOT_PLAY_STATE_IGNITED" => Some(Self::Ignited), - "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_START" => Some(Self::ScheduledForPlayStart), + "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_START" => { + Some(Self::ScheduledForPlayStart) + } "SLOT_PLAY_STATE_PLAYING" => Some(Self::Playing), "SLOT_PLAY_STATE_PAUSED" => Some(Self::Paused), - "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_RESTART" => Some(Self::ScheduledForPlayRestart), + "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_RESTART" => { + Some(Self::ScheduledForPlayRestart) + } "SLOT_PLAY_STATE_SCHEDULED_FOR_PLAY_STOP" => Some(Self::ScheduledForPlayStop), "SLOT_PLAY_STATE_SCHEDULED_FOR_RECORDING_START" => { Some(Self::ScheduledForRecordingStart) } "SLOT_PLAY_STATE_RECORDING" => Some(Self::Recording), - "SLOT_PLAY_STATE_SCHEDULED_FOR_RECORDING_STOP" => Some(Self::ScheduledForRecordingStop), + "SLOT_PLAY_STATE_SCHEDULED_FOR_RECORDING_STOP" => { + Some(Self::ScheduledForRecordingStop) + } _ => None, } } @@ -2697,7 +2763,9 @@ impl MidiDeviceStatus { pub fn as_str_name(&self) -> &'static str { match self { MidiDeviceStatus::Disconnected => "MIDI_DEVICE_STATUS_DISCONNECTED", - MidiDeviceStatus::ConnectedButDisabled => "MIDI_DEVICE_STATUS_CONNECTED_BUT_DISABLED", + MidiDeviceStatus::ConnectedButDisabled => { + "MIDI_DEVICE_STATUS_CONNECTED_BUT_DISABLED" + } MidiDeviceStatus::Connected => "MIDI_DEVICE_STATUS_CONNECTED", } } @@ -2705,7 +2773,9 @@ impl MidiDeviceStatus { pub fn from_str_name(value: &str) -> ::core::option::Option { match value { "MIDI_DEVICE_STATUS_DISCONNECTED" => Some(Self::Disconnected), - "MIDI_DEVICE_STATUS_CONNECTED_BUT_DISABLED" => Some(Self::ConnectedButDisabled), + "MIDI_DEVICE_STATUS_CONNECTED_BUT_DISABLED" => { + Some(Self::ConnectedButDisabled) + } "MIDI_DEVICE_STATUS_CONNECTED" => Some(Self::Connected), _ => None, } @@ -2731,9 +2801,13 @@ impl ArrangementPlayState { ArrangementPlayState::Unknown => "ARRANGEMENT_PLAY_STATE_UNKNOWN", ArrangementPlayState::Stopped => "ARRANGEMENT_PLAY_STATE_STOPPED", ArrangementPlayState::Playing => "ARRANGEMENT_PLAY_STATE_PLAYING", - ArrangementPlayState::PlayingPaused => "ARRANGEMENT_PLAY_STATE_PLAYING_PAUSED", + ArrangementPlayState::PlayingPaused => { + "ARRANGEMENT_PLAY_STATE_PLAYING_PAUSED" + } ArrangementPlayState::Recording => "ARRANGEMENT_PLAY_STATE_RECORDING", - ArrangementPlayState::RecordingPaused => "ARRANGEMENT_PLAY_STATE_RECORDING_PAUSED", + ArrangementPlayState::RecordingPaused => { + "ARRANGEMENT_PLAY_STATE_RECORDING_PAUSED" + } } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -2792,39 +2866,63 @@ pub mod helgobox_service_server { async fn get_host_info( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; async fn prove_authenticity( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; async fn get_app_settings( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// General instance queries async fn get_custom_instance_data( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// Playtime matrix queries async fn get_project_dir( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; async fn get_arrangement_info( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// Playtime clip queries async fn get_clip_detail( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// ReaLearn compartment queries async fn get_compartment_data( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// General global commands async fn trigger_global( &self, @@ -3006,8 +3104,12 @@ pub mod helgobox_service_server { ) -> std::result::Result, tonic::Status>; /// Server streaming response type for the GetOccasionalGlobalUpdates method. type GetOccasionalGlobalUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalGlobalUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// General global events async fn get_occasional_global_updates( @@ -3023,7 +3125,8 @@ pub mod helgobox_service_server { super::GetOccasionalPlaytimeEngineUpdatesReply, tonic::Status, >, - > + Send + > + + Send + 'static; /// Playtime global events async fn get_occasional_playtime_engine_updates( @@ -3035,8 +3138,12 @@ pub mod helgobox_service_server { >; /// Server streaming response type for the GetOccasionalInstanceUpdates method. type GetOccasionalInstanceUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalInstanceUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// General instance events async fn get_occasional_instance_updates( @@ -3048,17 +3155,28 @@ pub mod helgobox_service_server { >; /// Server streaming response type for the GetOccasionalUnitUpdates method. type GetOccasionalUnitUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalUnitUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; async fn get_occasional_unit_updates( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// Server streaming response type for the GetOccasionalMatrixUpdates method. type GetOccasionalMatrixUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalMatrixUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// Playtime matrix events async fn get_occasional_matrix_updates( @@ -3070,8 +3188,12 @@ pub mod helgobox_service_server { >; /// Server streaming response type for the GetContinuousMatrixUpdates method. type GetContinuousMatrixUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetContinuousMatrixUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; async fn get_continuous_matrix_updates( &self, @@ -3082,8 +3204,12 @@ pub mod helgobox_service_server { >; /// Server streaming response type for the GetOccasionalColumnUpdates method. type GetOccasionalColumnUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalColumnUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// Playtime column events async fn get_occasional_column_updates( @@ -3095,8 +3221,12 @@ pub mod helgobox_service_server { >; /// Server streaming response type for the GetContinuousColumnUpdates method. type GetContinuousColumnUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetContinuousColumnUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; async fn get_continuous_column_updates( &self, @@ -3107,8 +3237,12 @@ pub mod helgobox_service_server { >; /// Server streaming response type for the GetOccasionalTrackUpdates method. type GetOccasionalTrackUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalTrackUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// Playtime track events async fn get_occasional_track_updates( @@ -3120,43 +3254,71 @@ pub mod helgobox_service_server { >; /// Server streaming response type for the GetOccasionalRowUpdates method. type GetOccasionalRowUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalRowUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// Playtime row events async fn get_occasional_row_updates( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// Server streaming response type for the GetOccasionalSlotUpdates method. type GetOccasionalSlotUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalSlotUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// Playtime slot events async fn get_occasional_slot_updates( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// Server streaming response type for the GetContinuousSlotUpdates method. type GetContinuousSlotUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetContinuousSlotUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; async fn get_continuous_slot_updates( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// Server streaming response type for the GetOccasionalClipUpdates method. type GetOccasionalClipUpdatesStream: tonic::codegen::tokio_stream::Stream< - Item = std::result::Result, - > + Send + Item = std::result::Result< + super::GetOccasionalClipUpdatesReply, + tonic::Status, + >, + > + + Send + 'static; /// Playtime clip events async fn get_occasional_clip_updates( &self, request: tonic::Request, - ) -> std::result::Result, tonic::Status>; + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; } #[derive(Debug)] pub struct HelgoboxServiceServer { @@ -3181,7 +3343,10 @@ pub mod helgobox_service_server { max_encoding_message_size: None, } } - pub fn with_interceptor(inner: T, interceptor: F) -> InterceptedService + pub fn with_interceptor( + inner: T, + interceptor: F, + ) -> InterceptedService where F: tonic::service::Interceptor, { @@ -3237,11 +3402,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetHostInfo" => { #[allow(non_camel_case_types)] struct GetHostInfoSvc(pub Arc); - impl tonic::server::UnaryService - for GetHostInfoSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for GetHostInfoSvc { type Response = super::GetHostInfoReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -3279,19 +3448,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/ProveAuthenticity" => { #[allow(non_camel_case_types)] struct ProveAuthenticitySvc(pub Arc); - impl - tonic::server::UnaryService - for ProveAuthenticitySvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for ProveAuthenticitySvc { type Response = super::ProveAuthenticityReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::prove_authenticity(&inner, request).await + ::prove_authenticity(&inner, request) + .await }; Box::pin(fut) } @@ -3322,19 +3495,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetAppSettings" => { #[allow(non_camel_case_types)] struct GetAppSettingsSvc(pub Arc); - impl - tonic::server::UnaryService - for GetAppSettingsSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for GetAppSettingsSvc { type Response = super::GetAppSettingsReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_app_settings(&inner, request).await + ::get_app_settings(&inner, request) + .await }; Box::pin(fut) } @@ -3365,19 +3542,25 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetCustomInstanceData" => { #[allow(non_camel_case_types)] struct GetCustomInstanceDataSvc(pub Arc); - impl - tonic::server::UnaryService - for GetCustomInstanceDataSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for GetCustomInstanceDataSvc { type Response = super::GetCustomInstanceDataReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_custom_instance_data(&inner, request) + ::get_custom_instance_data( + &inner, + request, + ) .await }; Box::pin(fut) @@ -3409,19 +3592,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetProjectDir" => { #[allow(non_camel_case_types)] struct GetProjectDirSvc(pub Arc); - impl - tonic::server::UnaryService - for GetProjectDirSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for GetProjectDirSvc { type Response = super::GetProjectDirReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_project_dir(&inner, request).await + ::get_project_dir(&inner, request) + .await }; Box::pin(fut) } @@ -3452,19 +3639,26 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetArrangementInfo" => { #[allow(non_camel_case_types)] struct GetArrangementInfoSvc(pub Arc); - impl - tonic::server::UnaryService - for GetArrangementInfoSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for GetArrangementInfoSvc { type Response = super::GetArrangementInfoReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_arrangement_info(&inner, request).await + ::get_arrangement_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -3495,19 +3689,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetClipDetail" => { #[allow(non_camel_case_types)] struct GetClipDetailSvc(pub Arc); - impl - tonic::server::UnaryService - for GetClipDetailSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for GetClipDetailSvc { type Response = super::GetClipDetailReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_clip_detail(&inner, request).await + ::get_clip_detail(&inner, request) + .await }; Box::pin(fut) } @@ -3538,19 +3736,26 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetCompartmentData" => { #[allow(non_camel_case_types)] struct GetCompartmentDataSvc(pub Arc); - impl - tonic::server::UnaryService - for GetCompartmentDataSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for GetCompartmentDataSvc { type Response = super::GetCompartmentDataReply; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_compartment_data(&inner, request).await + ::get_compartment_data( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -3581,19 +3786,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerGlobal" => { #[allow(non_camel_case_types)] struct TriggerGlobalSvc(pub Arc); - impl - tonic::server::UnaryService - for TriggerGlobalSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerGlobalSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::trigger_global(&inner, request).await + ::trigger_global(&inner, request) + .await }; Box::pin(fut) } @@ -3624,19 +3833,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetAppSettings" => { #[allow(non_camel_case_types)] struct SetAppSettingsSvc(pub Arc); - impl - tonic::server::UnaryService - for SetAppSettingsSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetAppSettingsSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_app_settings(&inner, request).await + ::set_app_settings(&inner, request) + .await }; Box::pin(fut) } @@ -3667,11 +3880,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/AddLicense" => { #[allow(non_camel_case_types)] struct AddLicenseSvc(pub Arc); - impl tonic::server::UnaryService - for AddLicenseSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for AddLicenseSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -3709,19 +3926,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SaveController" => { #[allow(non_camel_case_types)] struct SaveControllerSvc(pub Arc); - impl - tonic::server::UnaryService - for SaveControllerSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SaveControllerSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::save_controller(&inner, request).await + ::save_controller(&inner, request) + .await }; Box::pin(fut) } @@ -3752,19 +3973,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/DeleteController" => { #[allow(non_camel_case_types)] struct DeleteControllerSvc(pub Arc); - impl - tonic::server::UnaryService - for DeleteControllerSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for DeleteControllerSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::delete_controller(&inner, request).await + ::delete_controller(&inner, request) + .await }; Box::pin(fut) } @@ -3795,22 +4020,29 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetPlaytimeEngineSettings" => { #[allow(non_camel_case_types)] struct SetPlaytimeEngineSettingsSvc(pub Arc); - impl - tonic::server::UnaryService - for SetPlaytimeEngineSettingsSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService< + super::SetPlaytimeEngineSettingsRequest, + > for SetPlaytimeEngineSettingsSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::SetPlaytimeEngineSettingsRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::set_playtime_engine_settings( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -3841,19 +4073,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerInstance" => { #[allow(non_camel_case_types)] struct TriggerInstanceSvc(pub Arc); - impl - tonic::server::UnaryService - for TriggerInstanceSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerInstanceSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::trigger_instance(&inner, request).await + ::trigger_instance(&inner, request) + .await }; Box::pin(fut) } @@ -3884,19 +4120,26 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetInstanceSettings" => { #[allow(non_camel_case_types)] struct SetInstanceSettingsSvc(pub Arc); - impl - tonic::server::UnaryService - for SetInstanceSettingsSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetInstanceSettingsSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_instance_settings(&inner, request).await + ::set_instance_settings( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -3927,19 +4170,25 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetCustomInstanceData" => { #[allow(non_camel_case_types)] struct SetCustomInstanceDataSvc(pub Arc); - impl - tonic::server::UnaryService - for SetCustomInstanceDataSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetCustomInstanceDataSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_custom_instance_data(&inner, request) + ::set_custom_instance_data( + &inner, + request, + ) .await }; Box::pin(fut) @@ -3971,19 +4220,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerMatrix" => { #[allow(non_camel_case_types)] struct TriggerMatrixSvc(pub Arc); - impl - tonic::server::UnaryService - for TriggerMatrixSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerMatrixSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::trigger_matrix(&inner, request).await + ::trigger_matrix(&inner, request) + .await }; Box::pin(fut) } @@ -4014,19 +4267,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetMatrixSettings" => { #[allow(non_camel_case_types)] struct SetMatrixSettingsSvc(pub Arc); - impl - tonic::server::UnaryService - for SetMatrixSettingsSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetMatrixSettingsSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_matrix_settings(&inner, request).await + ::set_matrix_settings(&inner, request) + .await }; Box::pin(fut) } @@ -4057,19 +4314,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetMatrixTempo" => { #[allow(non_camel_case_types)] struct SetMatrixTempoSvc(pub Arc); - impl - tonic::server::UnaryService - for SetMatrixTempoSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetMatrixTempoSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_matrix_tempo(&inner, request).await + ::set_matrix_tempo(&inner, request) + .await }; Box::pin(fut) } @@ -4100,19 +4361,25 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetMatrixTimeSignature" => { #[allow(non_camel_case_types)] struct SetMatrixTimeSignatureSvc(pub Arc); - impl - tonic::server::UnaryService - for SetMatrixTimeSignatureSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetMatrixTimeSignatureSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_matrix_time_signature(&inner, request) + ::set_matrix_time_signature( + &inner, + request, + ) .await }; Box::pin(fut) @@ -4144,19 +4411,26 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetMatrixPlayRate" => { #[allow(non_camel_case_types)] struct SetMatrixPlayRateSvc(pub Arc); - impl - tonic::server::UnaryService - for SetMatrixPlayRateSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetMatrixPlayRateSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_matrix_play_rate(&inner, request).await + ::set_matrix_play_rate( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -4187,19 +4461,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetMatrixVolume" => { #[allow(non_camel_case_types)] struct SetMatrixVolumeSvc(pub Arc); - impl - tonic::server::UnaryService - for SetMatrixVolumeSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetMatrixVolumeSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_matrix_volume(&inner, request).await + ::set_matrix_volume(&inner, request) + .await }; Box::pin(fut) } @@ -4230,18 +4508,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetMatrixPan" => { #[allow(non_camel_case_types)] struct SetMatrixPanSvc(pub Arc); - impl tonic::server::UnaryService - for SetMatrixPanSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetMatrixPanSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_matrix_pan(&inner, request).await + ::set_matrix_pan(&inner, request) + .await }; Box::pin(fut) } @@ -4272,19 +4555,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerColumn" => { #[allow(non_camel_case_types)] struct TriggerColumnSvc(pub Arc); - impl - tonic::server::UnaryService - for TriggerColumnSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerColumnSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::trigger_column(&inner, request).await + ::trigger_column(&inner, request) + .await }; Box::pin(fut) } @@ -4315,19 +4602,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/InsertColumns" => { #[allow(non_camel_case_types)] struct InsertColumnsSvc(pub Arc); - impl - tonic::server::UnaryService - for InsertColumnsSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for InsertColumnsSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::insert_columns(&inner, request).await + ::insert_columns(&inner, request) + .await }; Box::pin(fut) } @@ -4358,19 +4649,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetColumnSettings" => { #[allow(non_camel_case_types)] struct SetColumnSettingsSvc(pub Arc); - impl - tonic::server::UnaryService - for SetColumnSettingsSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetColumnSettingsSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_column_settings(&inner, request).await + ::set_column_settings(&inner, request) + .await }; Box::pin(fut) } @@ -4401,19 +4696,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetColumnTrack" => { #[allow(non_camel_case_types)] struct SetColumnTrackSvc(pub Arc); - impl - tonic::server::UnaryService - for SetColumnTrackSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetColumnTrackSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_column_track(&inner, request).await + ::set_column_track(&inner, request) + .await }; Box::pin(fut) } @@ -4444,11 +4743,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/DragColumn" => { #[allow(non_camel_case_types)] struct DragColumnSvc(pub Arc); - impl tonic::server::UnaryService - for DragColumnSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for DragColumnSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4486,11 +4789,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerTrack" => { #[allow(non_camel_case_types)] struct TriggerTrackSvc(pub Arc); - impl tonic::server::UnaryService - for TriggerTrackSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerTrackSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4528,18 +4835,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetTrackName" => { #[allow(non_camel_case_types)] struct SetTrackNameSvc(pub Arc); - impl tonic::server::UnaryService - for SetTrackNameSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetTrackNameSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_track_name(&inner, request).await + ::set_track_name(&inner, request) + .await }; Box::pin(fut) } @@ -4570,19 +4882,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetTrackColor" => { #[allow(non_camel_case_types)] struct SetTrackColorSvc(pub Arc); - impl - tonic::server::UnaryService - for SetTrackColorSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetTrackColorSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_track_color(&inner, request).await + ::set_track_color(&inner, request) + .await }; Box::pin(fut) } @@ -4613,19 +4929,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetTrackInput" => { #[allow(non_camel_case_types)] struct SetTrackInputSvc(pub Arc); - impl - tonic::server::UnaryService - for SetTrackInputSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetTrackInputSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_track_input(&inner, request).await + ::set_track_input(&inner, request) + .await }; Box::pin(fut) } @@ -4656,19 +4976,27 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetTrackInputMonitoring" => { #[allow(non_camel_case_types)] struct SetTrackInputMonitoringSvc(pub Arc); - impl - tonic::server::UnaryService - for SetTrackInputMonitoringSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetTrackInputMonitoringSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::SetTrackInputMonitoringRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_track_input_monitoring(&inner, request) + ::set_track_input_monitoring( + &inner, + request, + ) .await }; Box::pin(fut) @@ -4700,19 +5028,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetTrackVolume" => { #[allow(non_camel_case_types)] struct SetTrackVolumeSvc(pub Arc); - impl - tonic::server::UnaryService - for SetTrackVolumeSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetTrackVolumeSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_track_volume(&inner, request).await + ::set_track_volume(&inner, request) + .await }; Box::pin(fut) } @@ -4743,11 +5075,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetTrackPan" => { #[allow(non_camel_case_types)] struct SetTrackPanSvc(pub Arc); - impl tonic::server::UnaryService - for SetTrackPanSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetTrackPanSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4785,11 +5121,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/OpenTrackFx" => { #[allow(non_camel_case_types)] struct OpenTrackFxSvc(pub Arc); - impl tonic::server::UnaryService - for OpenTrackFxSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for OpenTrackFxSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4827,11 +5167,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerRow" => { #[allow(non_camel_case_types)] struct TriggerRowSvc(pub Arc); - impl tonic::server::UnaryService - for TriggerRowSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerRowSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4869,11 +5213,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetRowData" => { #[allow(non_camel_case_types)] struct SetRowDataSvc(pub Arc); - impl tonic::server::UnaryService - for SetRowDataSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetRowDataSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4911,9 +5259,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/DragRow" => { #[allow(non_camel_case_types)] struct DragRowSvc(pub Arc); - impl tonic::server::UnaryService for DragRowSvc { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for DragRowSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4951,11 +5305,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerSlot" => { #[allow(non_camel_case_types)] struct TriggerSlotSvc(pub Arc); - impl tonic::server::UnaryService - for TriggerSlotSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerSlotSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -4993,9 +5351,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/DragSlot" => { #[allow(non_camel_case_types)] struct DragSlotSvc(pub Arc); - impl tonic::server::UnaryService for DragSlotSvc { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for DragSlotSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -5033,11 +5397,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/ImportFiles" => { #[allow(non_camel_case_types)] struct ImportFilesSvc(pub Arc); - impl tonic::server::UnaryService - for ImportFilesSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for ImportFilesSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -5075,11 +5443,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerClip" => { #[allow(non_camel_case_types)] struct TriggerClipSvc(pub Arc); - impl tonic::server::UnaryService - for TriggerClipSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerClipSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -5117,11 +5489,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetClipName" => { #[allow(non_camel_case_types)] struct SetClipNameSvc(pub Arc); - impl tonic::server::UnaryService - for SetClipNameSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetClipNameSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -5159,11 +5535,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetClipData" => { #[allow(non_camel_case_types)] struct SetClipDataSvc(pub Arc); - impl tonic::server::UnaryService - for SetClipDataSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetClipDataSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -5201,9 +5581,15 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/DragClip" => { #[allow(non_camel_case_types)] struct DragClipSvc(pub Arc); - impl tonic::server::UnaryService for DragClipSvc { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for DragClipSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, @@ -5241,19 +5627,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/TriggerSequence" => { #[allow(non_camel_case_types)] struct TriggerSequenceSvc(pub Arc); - impl - tonic::server::UnaryService - for TriggerSequenceSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for TriggerSequenceSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::trigger_sequence(&inner, request).await + ::trigger_sequence(&inner, request) + .await }; Box::pin(fut) } @@ -5284,19 +5674,23 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SetSequenceInfo" => { #[allow(non_camel_case_types)] struct SetSequenceInfoSvc(pub Arc); - impl - tonic::server::UnaryService - for SetSequenceInfoSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService + for SetSequenceInfoSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::set_sequence_info(&inner, request).await + ::set_sequence_info(&inner, request) + .await }; Box::pin(fut) } @@ -5327,22 +5721,29 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/SaveCustomCompartmentData" => { #[allow(non_camel_case_types)] struct SaveCustomCompartmentDataSvc(pub Arc); - impl - tonic::server::UnaryService - for SaveCustomCompartmentDataSvc - { + impl< + T: HelgoboxService, + > tonic::server::UnaryService< + super::SaveCustomCompartmentDataRequest, + > for SaveCustomCompartmentDataSvc { type Response = super::Empty; - type Future = BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::SaveCustomCompartmentDataRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::save_custom_compartment_data( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5373,25 +5774,30 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalGlobalUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalGlobalUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalGlobalUpdatesRequest, - > for GetOccasionalGlobalUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalGlobalUpdatesRequest, + > for GetOccasionalGlobalUpdatesSvc { type Response = super::GetOccasionalGlobalUpdatesReply; type ResponseStream = T::GetOccasionalGlobalUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalGlobalUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::get_occasional_global_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5421,16 +5827,20 @@ pub mod helgobox_service_server { } "/generated.HelgoboxService/GetOccasionalPlaytimeEngineUpdates" => { #[allow(non_camel_case_types)] - struct GetOccasionalPlaytimeEngineUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalPlaytimeEngineUpdatesRequest, - > for GetOccasionalPlaytimeEngineUpdatesSvc - { + struct GetOccasionalPlaytimeEngineUpdatesSvc( + pub Arc, + ); + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalPlaytimeEngineUpdatesRequest, + > for GetOccasionalPlaytimeEngineUpdatesSvc { type Response = super::GetOccasionalPlaytimeEngineUpdatesReply; type ResponseStream = T::GetOccasionalPlaytimeEngineUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, request: tonic::Request< @@ -5440,9 +5850,10 @@ pub mod helgobox_service_server { let inner = Arc::clone(&self.0); let fut = async move { ::get_occasional_playtime_engine_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5472,26 +5883,33 @@ pub mod helgobox_service_server { } "/generated.HelgoboxService/GetOccasionalInstanceUpdates" => { #[allow(non_camel_case_types)] - struct GetOccasionalInstanceUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalInstanceUpdatesRequest, - > for GetOccasionalInstanceUpdatesSvc - { + struct GetOccasionalInstanceUpdatesSvc( + pub Arc, + ); + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalInstanceUpdatesRequest, + > for GetOccasionalInstanceUpdatesSvc { type Response = super::GetOccasionalInstanceUpdatesReply; type ResponseStream = T::GetOccasionalInstanceUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalInstanceUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::get_occasional_instance_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5522,22 +5940,29 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalUnitUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalUnitUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalUnitUpdatesRequest, - > for GetOccasionalUnitUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalUnitUpdatesRequest, + > for GetOccasionalUnitUpdatesSvc { type Response = super::GetOccasionalUnitUpdatesReply; type ResponseStream = T::GetOccasionalUnitUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalUnitUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_occasional_unit_updates(&inner, request) + ::get_occasional_unit_updates( + &inner, + request, + ) .await }; Box::pin(fut) @@ -5569,25 +5994,30 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalMatrixUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalMatrixUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalMatrixUpdatesRequest, - > for GetOccasionalMatrixUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalMatrixUpdatesRequest, + > for GetOccasionalMatrixUpdatesSvc { type Response = super::GetOccasionalMatrixUpdatesReply; type ResponseStream = T::GetOccasionalMatrixUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalMatrixUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::get_occasional_matrix_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5618,25 +6048,30 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetContinuousMatrixUpdates" => { #[allow(non_camel_case_types)] struct GetContinuousMatrixUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetContinuousMatrixUpdatesRequest, - > for GetContinuousMatrixUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetContinuousMatrixUpdatesRequest, + > for GetContinuousMatrixUpdatesSvc { type Response = super::GetContinuousMatrixUpdatesReply; type ResponseStream = T::GetContinuousMatrixUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetContinuousMatrixUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::get_continuous_matrix_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5667,25 +6102,30 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalColumnUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalColumnUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalColumnUpdatesRequest, - > for GetOccasionalColumnUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalColumnUpdatesRequest, + > for GetOccasionalColumnUpdatesSvc { type Response = super::GetOccasionalColumnUpdatesReply; type ResponseStream = T::GetOccasionalColumnUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalColumnUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::get_occasional_column_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5716,25 +6156,30 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetContinuousColumnUpdates" => { #[allow(non_camel_case_types)] struct GetContinuousColumnUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetContinuousColumnUpdatesRequest, - > for GetContinuousColumnUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetContinuousColumnUpdatesRequest, + > for GetContinuousColumnUpdatesSvc { type Response = super::GetContinuousColumnUpdatesReply; type ResponseStream = T::GetContinuousColumnUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetContinuousColumnUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::get_continuous_column_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5765,25 +6210,30 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalTrackUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalTrackUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalTrackUpdatesRequest, - > for GetOccasionalTrackUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalTrackUpdatesRequest, + > for GetOccasionalTrackUpdatesSvc { type Response = super::GetOccasionalTrackUpdatesReply; type ResponseStream = T::GetOccasionalTrackUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalTrackUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::get_occasional_track_updates( - &inner, request, - ) - .await + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5814,21 +6264,29 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalRowUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalRowUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService - for GetOccasionalRowUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalRowUpdatesRequest, + > for GetOccasionalRowUpdatesSvc { type Response = super::GetOccasionalRowUpdatesReply; type ResponseStream = T::GetOccasionalRowUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalRowUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_occasional_row_updates(&inner, request) + ::get_occasional_row_updates( + &inner, + request, + ) .await }; Box::pin(fut) @@ -5860,22 +6318,29 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalSlotUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalSlotUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalSlotUpdatesRequest, - > for GetOccasionalSlotUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalSlotUpdatesRequest, + > for GetOccasionalSlotUpdatesSvc { type Response = super::GetOccasionalSlotUpdatesReply; type ResponseStream = T::GetOccasionalSlotUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalSlotUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_occasional_slot_updates(&inner, request) + ::get_occasional_slot_updates( + &inner, + request, + ) .await }; Box::pin(fut) @@ -5907,22 +6372,29 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetContinuousSlotUpdates" => { #[allow(non_camel_case_types)] struct GetContinuousSlotUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetContinuousSlotUpdatesRequest, - > for GetContinuousSlotUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetContinuousSlotUpdatesRequest, + > for GetContinuousSlotUpdatesSvc { type Response = super::GetContinuousSlotUpdatesReply; type ResponseStream = T::GetContinuousSlotUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetContinuousSlotUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_continuous_slot_updates(&inner, request) + ::get_continuous_slot_updates( + &inner, + request, + ) .await }; Box::pin(fut) @@ -5954,22 +6426,29 @@ pub mod helgobox_service_server { "/generated.HelgoboxService/GetOccasionalClipUpdates" => { #[allow(non_camel_case_types)] struct GetOccasionalClipUpdatesSvc(pub Arc); - impl - tonic::server::ServerStreamingService< - super::GetOccasionalClipUpdatesRequest, - > for GetOccasionalClipUpdatesSvc - { + impl< + T: HelgoboxService, + > tonic::server::ServerStreamingService< + super::GetOccasionalClipUpdatesRequest, + > for GetOccasionalClipUpdatesSvc { type Response = super::GetOccasionalClipUpdatesReply; type ResponseStream = T::GetOccasionalClipUpdatesStream; - type Future = - BoxFuture, tonic::Status>; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; fn call( &mut self, - request: tonic::Request, + request: tonic::Request< + super::GetOccasionalClipUpdatesRequest, + >, ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - ::get_occasional_clip_updates(&inner, request) + ::get_occasional_clip_updates( + &inner, + request, + ) .await }; Box::pin(fut) @@ -5998,14 +6477,18 @@ pub mod helgobox_service_server { }; Box::pin(fut) } - _ => Box::pin(async move { - Ok(http::Response::builder() - .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") - .body(empty_body()) - .unwrap()) - }), + _ => { + Box::pin(async move { + Ok( + http::Response::builder() + .status(200) + .header("grpc-status", "12") + .header("content-type", "application/grpc") + .body(empty_body()) + .unwrap(), + ) + }) + } } } } diff --git a/playtime-api/src/persistence/mod.rs b/playtime-api/src/persistence/mod.rs index 428b8dfe..2bf0556b 100644 --- a/playtime-api/src/persistence/mod.rs +++ b/playtime-api/src/persistence/mod.rs @@ -95,8 +95,8 @@ pub struct Matrix { pub activate_slot_on_trigger: bool, #[serde(skip_serializing_if = "Option::is_none")] pub click_volume: Option, - // #[serde(skip_serializing_if = "Option::is_none")] - // pub pre_roll_bars: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub pre_roll_bars: Option, #[serde(skip_serializing_if = "Option::is_none")] pub color_palette: Option, #[serde(default)] @@ -139,6 +139,7 @@ impl Default for Matrix { common_tempo_range: Default::default(), activate_slot_on_trigger: ACTIVATE_SLOT_ON_TRIGGER_DEFAULT, click_volume: None, + pre_roll_bars: None, color_palette: None, content_quantization_settings: Default::default(), sequencer: Default::default(), @@ -148,6 +149,7 @@ impl Default for Matrix { } pub const ACTIVATE_SLOT_ON_TRIGGER_DEFAULT: bool = true; +pub const PRE_ROLL_BARS_DEFAULT: u32 = 2; #[derive(Clone, PartialEq, Debug, Default, Serialize, Deserialize)] pub struct MatrixSequencer { @@ -266,7 +268,8 @@ impl SignedMatrix { } } -/// This is redundant (already contained in [`Matrix`]) but used to transfer settings only. +/// This is redundant (already contained in [`Matrix`]) but used to transfer settings only, without all the content +/// (columns, rows, slots). #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)] pub struct MatrixSettings { pub clip_play_settings: MatrixClipPlaySettings, @@ -276,6 +279,7 @@ pub struct MatrixSettings { pub content_quantization_settings: ContentQuantizationSettings, pub activate_slot_on_trigger: bool, pub transport_sync_mode: TransportSyncMode, + pub pre_roll_bars: u32, } impl Matrix { diff --git a/playtime-clip-engine b/playtime-clip-engine index 8b6555ff..64a69b4d 160000 --- a/playtime-clip-engine +++ b/playtime-clip-engine @@ -1 +1 @@ -Subproject commit 8b6555ff7220bdb1e8d2eac140c30b3c351c4048 +Subproject commit 64a69b4d4df1c53ef381e54eb986808a95098a92