Rename

chanonly123 · Feb 24, 2025 · de6982f · de6982f
1 parent 2a10b46
commit de6982f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/flutter_app/lib/main.dart b/flutter_app/lib/main.dart
@@ -140,7 +140,7 @@ class PlayerPageState extends State<PlayerPage> {
                 ElevatedButton(
                   onPressed: () async {
                     final path = await AssetHelper.extractAsset('assets/media/music_big.mp3');
-                    player.setMixData(MixerData(
+                    player.setMixData(MixerComposeModel(
                       outputDuration: 150,
                       tracks: [
                         MixerTrack(id: "0", path: path),
@@ -190,12 +190,12 @@ class PlayerPageState extends State<PlayerPage> {
     return "${device.name} ${device.isSelected ? " ✅" : ""}";
   }
 
-  Future<MixerData> createMetronomeTracks() async {
+  Future<MixerComposeModel> createMetronomeTracks() async {
     final path = await AssetHelper.extractAsset('assets/media/music_big.mp3');
     final pathH = await AssetHelper.extractAsset('assets/media/met_h.wav');
     final pathL = await AssetHelper.extractAsset('assets/media/met_l.wav');
     double metVol = 0.1;
-    return MixerData(
+    return MixerComposeModel(
       tracks: [
         MixerTrack(id: "music", path: path),
         MixerTrack(id: "met_1", path: pathH, offset: 0, repeat: true, repeatInterval: 2, volume: metVol),

diff --git a/juce_mix_player_package/lib/juce_mix_player.dart b/juce_mix_player_package/lib/juce_mix_player.dart
@@ -80,14 +80,14 @@ NativeCallable<FloatCallback>? _levelCallbackNativeCallable;
   }
 
   void setFile(String path) {
-    MixerData data = MixerData(tracks: [
+    MixerComposeModel data = MixerComposeModel(tracks: [
       MixerTrack(id: "id_0", path: path),
     ]);
     final jsonStr = json.encode(data.toJson());
     _juceLib.JuceMixPlayer_set(_ptr, jsonStr.toNativeUtf8());
   }
 
-  void setMixData(MixerData data) {
+  void setMixData(MixerComposeModel data) {
     final jsonStr = json.encode(data.toJson());
     _juceLib.JuceMixPlayer_set(_ptr, jsonStr.toNativeUtf8());
   }
@@ -147,18 +147,18 @@ NativeCallable<FloatCallback>? _levelCallbackNativeCallable;
   }
 }
 
-class MixerData {
+class MixerComposeModel {
   List<MixerTrack>? tracks;
   String? output;
   double? outputDuration;
 
-  MixerData({
+  MixerComposeModel({
     required this.tracks,
     this.output,
     this.outputDuration,
   });
 
-  factory MixerData.fromJson(Map<String, dynamic> json) => MixerData(
+  factory MixerComposeModel.fromJson(Map<String, dynamic> json) => MixerComposeModel(
         tracks: (json['tracks'] as List<dynamic>?)?.map((e) => MixerTrack.fromJson(e as Map<String, dynamic>)).toList(),
         output: json['output'],
         outputDuration: json['outputDuration']?.toDouble(),