refactor: consolidate

lib/mpv/models.dart

@@ -0,0 +1,292 @@
+/// Log level for player messages.
+enum PlayerLogLevel {
+  /// No logging.
+  none,
+
+  /// Fatal errors only.
+  fatal,
+
+  /// Errors.
+  error,
+
+  /// Warnings.
+  warn,
+
+  /// Informational messages.
+  info,
+
+  /// Verbose output.
+  verbose,
+
+  /// Debug messages.
+  debug,
+
+  /// Trace-level output (very verbose).
+  trace,
+}
+
+/// Represents an audio track in the media.
+class AudioTrack {
+  /// Unique identifier for the track.
+  final String id;
+
+  /// Human-readable title of the track.
+  final String? title;
+
+  /// Language code (e.g., 'eng', 'jpn').
+  final String? language;
+
+  /// Audio codec (e.g., 'aac', 'ac3', 'dts').
+  final String? codec;
+
+  /// Number of audio channels.
+  final int? channels;
+
+  /// Alias for channels (media_kit compatibility).
+  int? get channelsCount => channels;
+
+  /// Sample rate in Hz.
+  final int? sampleRate;
+
+  /// Bitrate in bits per second.
+  final int? bitrate;
+
+  /// Whether this is the default track.
+  final bool isDefault;
+
+  /// Whether this track is forced.
+  final bool isForced;
+
+  const AudioTrack({
+    required this.id,
+    this.title,
+    this.language,
+    this.codec,
+    this.channels,
+    this.sampleRate,
+    this.bitrate,
+    this.isDefault = false,
+    this.isForced = false,
+  });
+
+  /// Auto-select track.
+  static const auto = AudioTrack(id: 'auto', title: 'Auto');
+
+  /// Disable audio.
+  static const off = AudioTrack(id: 'no', title: 'Off');
+
+  /// Returns a display name for the track.
+  String get displayName {
+    if (title != null && title!.isNotEmpty) return title!;
+    if (language != null && language!.isNotEmpty) return language!;
+    return 'Track $id';
+  }
+
+  @override
+  String toString() => 'AudioTrack($id, $displayName)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is AudioTrack && runtimeType == other.runtimeType && id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
+
+/// Represents a subtitle track in the media.
+class SubtitleTrack {
+  /// Unique identifier for the track.
+  final String id;
+
+  /// Human-readable title of the track.
+  final String? title;
+
+  /// Language code (e.g., 'eng', 'jpn').
+  final String? language;
+
+  /// Subtitle codec/format (e.g., 'subrip', 'ass', 'pgs').
+  final String? codec;
+
+  /// Whether this is the default track.
+  final bool isDefault;
+
+  /// Whether this track is forced (e.g., for foreign language segments).
+  final bool isForced;
+
+  /// Whether this is an external subtitle file.
+  final bool isExternal;
+
+  /// URI of external subtitle file (if isExternal is true).
+  final String? uri;
+
+  const SubtitleTrack({
+    required this.id,
+    this.title,
+    this.language,
+    this.codec,
+    this.isDefault = false,
+    this.isForced = false,
+    this.isExternal = false,
+    this.uri,
+  });
+
+  /// Create a subtitle track from an external URI.
+  factory SubtitleTrack.uri(String uri, {String? title, String? language}) {
+    return SubtitleTrack(
+      id: 'external:$uri',
+      title: title,
+      language: language,
+      isExternal: true,
+      uri: uri,
+    );
+  }
+
+  /// Auto-select track.
+  static const auto = SubtitleTrack(id: 'auto', title: 'Auto');
+
+  /// Disable subtitles.
+  static const off = SubtitleTrack(id: 'no', title: 'Off');
+
+  /// Returns a display name for the track.
+  String get displayName {
+    if (title != null && title!.isNotEmpty) return title!;
+    if (language != null && language!.isNotEmpty) return language!;
+    if (isExternal) return 'External';
+    return 'Track $id';
+  }
+
+  @override
+  String toString() => 'SubtitleTrack($id, $displayName)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is SubtitleTrack &&
+          runtimeType == other.runtimeType &&
+          id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
+
+/// Container for all available tracks in the media.
+class Tracks {
+  /// Available audio tracks.
+  final List<AudioTrack> audio;
+
+  /// Available subtitle tracks.
+  final List<SubtitleTrack> subtitle;
+
+  const Tracks({this.audio = const [], this.subtitle = const []});
+
+  /// Creates a copy with the given fields replaced.
+  Tracks copyWith({List<AudioTrack>? audio, List<SubtitleTrack>? subtitle}) {
+    return Tracks(
+      audio: audio ?? this.audio,
+      subtitle: subtitle ?? this.subtitle,
+    );
+  }
+
+  @override
+  String toString() =>
+      'Tracks(audio: ${audio.length}, subtitle: ${subtitle.length})';
+}
+
+/// Represents the currently selected tracks.
+class TrackSelection {
+  /// Currently selected audio track.
+  final AudioTrack? audio;
+
+  /// Currently selected subtitle track.
+  final SubtitleTrack? subtitle;
+
+  const TrackSelection({this.audio, this.subtitle});
+
+  /// Creates a copy with the given fields replaced.
+  TrackSelection copyWith({AudioTrack? audio, SubtitleTrack? subtitle}) {
+    return TrackSelection(
+      audio: audio ?? this.audio,
+      subtitle: subtitle ?? this.subtitle,
+    );
+  }
+
+  @override
+  String toString() => 'TrackSelection(audio: $audio, subtitle: $subtitle)';
+}
+
+/// Represents an audio output device.
+class AudioDevice {
+  /// Unique identifier for the device.
+  final String name;
+
+  /// Human-readable description of the device.
+  final String description;
+
+  const AudioDevice({required this.name, this.description = ''});
+
+  /// Default/auto audio device.
+  static const auto = AudioDevice(name: 'auto', description: 'Auto');
+
+  @override
+  String toString() => 'AudioDevice($name, $description)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is AudioDevice &&
+          runtimeType == other.runtimeType &&
+          name == other.name;
+
+  @override
+  int get hashCode => name.hashCode;
+}
+
+/// A log entry from the player.
+class PlayerLog {
+  /// The log level of this message.
+  final PlayerLogLevel level;
+
+  /// The prefix/category of the log message (e.g., 'cplayer', 'ffmpeg').
+  final String prefix;
+
+  /// The log message text.
+  final String text;
+
+  const PlayerLog({
+    required this.level,
+    required this.prefix,
+    required this.text,
+  });
+
+  @override
+  String toString() => '[$prefix] ${level.name}: $text';
+}
+
+/// Represents a media source for the player.
+class Media {
+  /// The URI of the media (file path, HTTP URL, etc.).
+  final String uri;
+
+  /// Optional HTTP headers for network requests.
+  final Map<String, String>? headers;
+
+  /// Optional start position for playback.
+  final Duration? start;
+
+  const Media(this.uri, {this.headers, this.start});
+
+  @override
+  String toString() => 'Media($uri)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is Media &&
+          runtimeType == other.runtimeType &&
+          uri == other.uri &&
+          start == other.start;
+
+  @override
+  int get hashCode => uri.hashCode ^ start.hashCode;
+}

lib/mpv/models/audio_device.dart

@@ -1,26 +0,0 @@
-/// Represents an audio output device.
-class AudioDevice {
-  /// Unique identifier for the device.
-  final String name;
-
-  /// Human-readable description of the device.
-  final String description;
-
-  const AudioDevice({required this.name, this.description = ''});
-
-  /// Default/auto audio device.
-  static const auto = AudioDevice(name: 'auto', description: 'Auto');
-
-  @override
-  String toString() => 'AudioDevice($name, $description)';
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is AudioDevice &&
-          runtimeType == other.runtimeType &&
-          name == other.name;
-
-  @override
-  int get hashCode => name.hashCode;
-}

lib/mpv/models/audio_track.dart

@@ -1,68 +0,0 @@
-/// Represents an audio track in the media.
-class AudioTrack {
-  /// Unique identifier for the track.
-  final String id;
-
-  /// Human-readable title of the track.
-  final String? title;
-
-  /// Language code (e.g., 'eng', 'jpn').
-  final String? language;
-
-  /// Audio codec (e.g., 'aac', 'ac3', 'dts').
-  final String? codec;
-
-  /// Number of audio channels.
-  final int? channels;
-
-  /// Alias for channels (media_kit compatibility).
-  int? get channelsCount => channels;
-
-  /// Sample rate in Hz.
-  final int? sampleRate;
-
-  /// Bitrate in bits per second.
-  final int? bitrate;
-
-  /// Whether this is the default track.
-  final bool isDefault;
-
-  /// Whether this track is forced.
-  final bool isForced;
-
-  const AudioTrack({
-    required this.id,
-    this.title,
-    this.language,
-    this.codec,
-    this.channels,
-    this.sampleRate,
-    this.bitrate,
-    this.isDefault = false,
-    this.isForced = false,
-  });
-
-  /// Auto-select track.
-  static const auto = AudioTrack(id: 'auto', title: 'Auto');
-
-  /// Disable audio.
-  static const off = AudioTrack(id: 'no', title: 'Off');
-
-  /// Returns a display name for the track.
-  String get displayName {
-    if (title != null && title!.isNotEmpty) return title!;
-    if (language != null && language!.isNotEmpty) return language!;
-    return 'Track $id';
-  }
-
-  @override
-  String toString() => 'AudioTrack($id, $displayName)';
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is AudioTrack && runtimeType == other.runtimeType && id == other.id;
-
-  @override
-  int get hashCode => id.hashCode;
-}

lib/mpv/models/media.dart

@@ -1,27 +0,0 @@
-/// Represents a media source for the player.
-class Media {
-  /// The URI of the media (file path, HTTP URL, etc.).
-  final String uri;
-
-  /// Optional HTTP headers for network requests.
-  final Map<String, String>? headers;
-
-  /// Optional start position for playback.
-  final Duration? start;
-
-  const Media(this.uri, {this.headers, this.start});
-
-  @override
-  String toString() => 'Media($uri)';
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is Media &&
-          runtimeType == other.runtimeType &&
-          uri == other.uri &&
-          start == other.start;
-
-  @override
-  int get hashCode => uri.hashCode ^ start.hashCode;
-}

lib/mpv/models/player_log.dart

@@ -1,22 +0,0 @@
-import 'player_log_level.dart';
-
-/// A log entry from the player.
-class PlayerLog {
-  /// The log level of this message.
-  final PlayerLogLevel level;
-
-  /// The prefix/category of the log message (e.g., 'cplayer', 'ffmpeg').
-  final String prefix;
-
-  /// The log message text.
-  final String text;
-
-  const PlayerLog({
-    required this.level,
-    required this.prefix,
-    required this.text,
-  });
-
-  @override
-  String toString() => '[$prefix] ${level.name}: $text';
-}

lib/mpv/models/player_log_level.dart

@@ -1,26 +0,0 @@
-/// Log level for player messages.
-enum PlayerLogLevel {
-  /// No logging.
-  none,
-
-  /// Fatal errors only.
-  fatal,
-
-  /// Errors.
-  error,
-
-  /// Warnings.
-  warn,
-
-  /// Informational messages.
-  info,
-
-  /// Verbose output.
-  verbose,
-
-  /// Debug messages.
-  debug,
-
-  /// Trace-level output (very verbose).
-  trace,
-}

lib/mpv/models/subtitle_track.dart

@@ -1,75 +0,0 @@
-/// Represents a subtitle track in the media.
-class SubtitleTrack {
-  /// Unique identifier for the track.
-  final String id;
-
-  /// Human-readable title of the track.
-  final String? title;
-
-  /// Language code (e.g., 'eng', 'jpn').
-  final String? language;
-
-  /// Subtitle codec/format (e.g., 'subrip', 'ass', 'pgs').
-  final String? codec;
-
-  /// Whether this is the default track.
-  final bool isDefault;
-
-  /// Whether this track is forced (e.g., for foreign language segments).
-  final bool isForced;
-
-  /// Whether this is an external subtitle file.
-  final bool isExternal;
-
-  /// URI of external subtitle file (if isExternal is true).
-  final String? uri;
-
-  const SubtitleTrack({
-    required this.id,
-    this.title,
-    this.language,
-    this.codec,
-    this.isDefault = false,
-    this.isForced = false,
-    this.isExternal = false,
-    this.uri,
-  });
-
-  /// Create a subtitle track from an external URI.
-  factory SubtitleTrack.uri(String uri, {String? title, String? language}) {
-    return SubtitleTrack(
-      id: 'external:$uri',
-      title: title,
-      language: language,
-      isExternal: true,
-      uri: uri,
-    );
-  }
-
-  /// Auto-select track.
-  static const auto = SubtitleTrack(id: 'auto', title: 'Auto');
-
-  /// Disable subtitles.
-  static const off = SubtitleTrack(id: 'no', title: 'Off');
-
-  /// Returns a display name for the track.
-  String get displayName {
-    if (title != null && title!.isNotEmpty) return title!;
-    if (language != null && language!.isNotEmpty) return language!;
-    if (isExternal) return 'External';
-    return 'Track $id';
-  }
-
-  @override
-  String toString() => 'SubtitleTrack($id, $displayName)';
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is SubtitleTrack &&
-          runtimeType == other.runtimeType &&
-          id == other.id;
-
-  @override
-  int get hashCode => id.hashCode;
-}

lib/mpv/models/track_selection.dart

@@ -1,24 +0,0 @@
-import 'audio_track.dart';
-import 'subtitle_track.dart';
-
-/// Represents the currently selected tracks.
-class TrackSelection {
-  /// Currently selected audio track.
-  final AudioTrack? audio;
-
-  /// Currently selected subtitle track.
-  final SubtitleTrack? subtitle;
-
-  const TrackSelection({this.audio, this.subtitle});
-
-  /// Creates a copy with the given fields replaced.
-  TrackSelection copyWith({AudioTrack? audio, SubtitleTrack? subtitle}) {
-    return TrackSelection(
-      audio: audio ?? this.audio,
-      subtitle: subtitle ?? this.subtitle,
-    );
-  }
-
-  @override
-  String toString() => 'TrackSelection(audio: $audio, subtitle: $subtitle)';
-}

lib/mpv/models/tracks.dart

@@ -1,25 +0,0 @@
-import 'audio_track.dart';
-import 'subtitle_track.dart';
-
-/// Container for all available tracks in the media.
-class Tracks {
-  /// Available audio tracks.
-  final List<AudioTrack> audio;
-
-  /// Available subtitle tracks.
-  final List<SubtitleTrack> subtitle;
-
-  const Tracks({this.audio = const [], this.subtitle = const []});
-
-  /// Creates a copy with the given fields replaced.
-  Tracks copyWith({List<AudioTrack>? audio, List<SubtitleTrack>? subtitle}) {
-    return Tracks(
-      audio: audio ?? this.audio,
-      subtitle: subtitle ?? this.subtitle,
-    );
-  }
-
-  @override
-  String toString() =>
-      'Tracks(audio: ${audio.length}, subtitle: ${subtitle.length})';
-}

lib/mpv/mpv.dart

@@ -49,14 +49,7 @@ export 'player/player_state.dart';
 export 'player/player_streams.dart';
 
 // Models
-export 'models/media.dart';
-export 'models/audio_device.dart';
-export 'models/audio_track.dart';
-export 'models/subtitle_track.dart';
-export 'models/tracks.dart';
-export 'models/track_selection.dart';
-export 'models/player_log.dart';
-export 'models/player_log_level.dart';
+export 'models.dart';
 
 // Video
-export 'video/video.dart';
+export 'video.dart';

lib/mpv/player/player.dart

@@ -1,9 +1,6 @@
 import 'dart:io' show Platform;
 
-import '../models/audio_device.dart';
-import '../models/media.dart';
-import '../models/audio_track.dart';
-import '../models/subtitle_track.dart';
+import '../models.dart';
 import 'player_native.dart';
 import 'player_state.dart';
 import 'player_streams.dart';

lib/mpv/player/player_native.dart

@@ -4,15 +4,8 @@ import 'dart:io' show Platform;
 
 import 'package:flutter/services.dart';
 
-import '../utils/android_font_loader.dart';
-
-import '../models/audio_device.dart';
-import '../models/audio_track.dart';
-import '../models/player_log.dart';
-import '../models/media.dart';
-import '../models/subtitle_track.dart';
-import '../models/track_selection.dart';
-import '../models/tracks.dart';
+import '../android_font_loader.dart';
+import '../models.dart';
 import 'player.dart';
 import 'player_state.dart';
 import 'player_streams.dart';

lib/mpv/player/player_state.dart

@@ -1,6 +1,4 @@
-import '../models/audio_device.dart';
-import '../models/tracks.dart';
-import '../models/track_selection.dart';
+import '../models.dart';
 
 /// Immutable snapshot of the current player state.
 ///

lib/mpv/player/player_streams.dart

@@ -1,7 +1,4 @@
-import '../models/audio_device.dart';
-import '../models/player_log.dart';
-import '../models/tracks.dart';
-import '../models/track_selection.dart';
+import '../models.dart';
 
 /// Reactive streams for player state changes.
 ///

lib/mpv/video.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../player/player.dart';
-import '../player/video_rect_support.dart';
+import 'player/player.dart';
+import 'player/video_rect_support.dart';
 
 /// Video widget for displaying player output.
 ///