diff --git a/src/changeset.rs b/src/changeset.rs index 8ba9889..c897f1d 100644 --- a/src/changeset.rs +++ b/src/changeset.rs @@ -3,8 +3,8 @@ use std::collections::HashMap; use serde::{Deserialize, Serialize}; use crate::common::VersionId; -use crate::edit_commands::{CommandDiff, EditCommandId}; use crate::track::{EventId, Note, Track, TrackEvent, TrackEventType}; +use crate::track_edit::{CommandDiff, EditCommandId}; /// Simplest track edit operation. See [Changeset] for uses. #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)] diff --git a/src/main.rs b/src/main.rs index 847a30c..b291dd6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,13 +11,13 @@ mod audio_setup; mod changeset; mod common; mod config; -mod edit_commands; mod engine; mod midi; mod midi_vst; mod project; mod stave; mod track; +mod track_edit; mod track_history; mod track_source; mod util; diff --git a/src/stave.rs b/src/stave.rs index 5c6f9d9..44374e9 100644 --- a/src/stave.rs +++ b/src/stave.rs @@ -12,13 +12,13 @@ use ordered_float::OrderedFloat; use serde::{Deserialize, Serialize}; use crate::common::{Time, VersionId}; -use crate::edit_commands::{ - accent_selected_notes, add_new_note, delete_selected, set_damper, shift_selected, shift_tail, - stretch_selected_notes, tape_delete, tape_insert, transpose_selected_notes, -}; use crate::track::{ export_smf, EventId, Level, Pitch, Track, TrackEvent, TrackEventType, MIDI_CC_SUSTAIN_ID, }; +use crate::track_edit::{ + accent_selected_notes, add_new_note, delete_selected, set_damper, shift_selected, shift_tail, + stretch_selected_notes, tape_delete, tape_insert, transpose_selected_notes, +}; use crate::track_history::TrackHistory; use crate::{util, Pix}; diff --git a/src/edit_commands.rs b/src/track_edit.rs similarity index 100% rename from src/edit_commands.rs rename to src/track_edit.rs diff --git a/src/track_history.rs b/src/track_history.rs index c002d0b..4a5d1a1 100644 --- a/src/track_history.rs +++ b/src/track_history.rs @@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize}; use crate::changeset::{Changeset, EventAction, HistoryLogEntry, Snapshot}; use crate::common::VersionId; -use crate::edit_commands::{apply_diffs, revert_diffs, CommandDiff, EditCommandId}; use crate::track::{import_smf, Track}; +use crate::track_edit::{apply_diffs, revert_diffs, CommandDiff, EditCommandId}; use crate::util; use crate::util::IdSeq;