gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-19 20:26:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature: Add support for mediaSegments (#138)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2024-11-09 19:40:12 +01:00 • committed by GitHub
parent 36758bd508
commit 5c560e54b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 6823 additions and 8312 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/screens/video_player/video_player_controls.dart
View file

@ -13,7 +13,7 @@ import 'package:screen_brightness/screen_brightness.dart';
import 'package:universal_html/html.dart' as html;
import 'package:window_manager/window_manager.dart';
import 'package:fladder/models/items/intro_skip_model.dart';
import 'package:fladder/models/items/media_segments_model.dart';
import 'package:fladder/models/media_playback_model.dart';
import 'package:fladder/models/playback/playback_model.dart';
import 'package:fladder/providers/settings/client_settings_provider.dart';
@ -57,10 +57,10 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
late final double bottomPadding = MediaQuery.of(context).viewPadding.bottom;
bool _onKey(KeyEvent value) {
final introSkipModel = ref.read(playBackModel.select((value) => value?.introSkipModel));
final mediaSegments = ref.read(playBackModel.select((value) => value?.mediaSegments));
final position = ref.read(mediaPlaybackProvider).position;
bool showIntroSkipButton = introSkipModel?.introInRange(position) ?? false;
bool showCreditSkipButton = introSkipModel?.creditsInRange(position) ?? false;
bool showIntroSkipButton = mediaSegments?.intro?.inRange(position) ?? false;
bool showOutroSkipButton = mediaSegments?.outro?.inRange(position) ?? false;
if (value is KeyRepeatEvent) {
if (value.logicalKey == LogicalKeyboardKey.arrowUp) {
resetTimer();
@ -76,9 +76,9 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
if (value is KeyDownEvent) {
if (value.logicalKey == LogicalKeyboardKey.keyS) {
if (showIntroSkipButton) {
skipIntro(introSkipModel);
} else if (showCreditSkipButton) {
skipCredits(introSkipModel);
skipIntro(mediaSegments);
} else if (showOutroSkipButton) {
skipOutro(mediaSegments);
}
return true;
}
@ -116,7 +116,7 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
@override
Widget build(BuildContext context) {
final introSkipModel = ref.watch(playBackModel.select((value) => value?.introSkipModel));
final mediaSegments = ref.watch(playBackModel.select((value) => value?.mediaSegments));
final player = ref.watch(videoPlayerProvider.select((value) => value.controller));
return InputHandler(
autoFocus: false,
@ -167,8 +167,8 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
Consumer(
builder: (context, ref, child) {
final position = ref.watch(mediaPlaybackProvider.select((value) => value.position));
bool showIntroSkipButton = introSkipModel?.introInRange(position) ?? false;
bool showCreditSkipButton = introSkipModel?.creditsInRange(position) ?? false;
bool showIntroSkipButton = mediaSegments?.intro?.inRange(position) ?? false;
bool showOutroSkipButton = mediaSegments?.outro?.inRange(position) ?? false;
return Stack(
children: [
if (showIntroSkipButton)
@ -178,18 +178,18 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
padding: const EdgeInsets.all(32),
child: IntroSkipButton(
isOverlayVisible: showOverlay,
skipIntro: () => skipIntro(introSkipModel),
skipIntro: () => skipIntro(mediaSegments),
),
),
),
if (showCreditSkipButton)
if (showOutroSkipButton)
Align(
alignment: Alignment.centerRight,
child: Padding(
padding: const EdgeInsets.all(32),
child: CreditsSkipButton(
child: OutroSkipButton(
isOverlayVisible: showOverlay,
skipCredits: () => skipCredits(introSkipModel),
skipOutro: () => skipOutro(mediaSegments),
),
),
)
@ -582,17 +582,17 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
);
}
void skipIntro(IntroOutSkipModel? introSkipModel) {
void skipIntro(MediaSegmentsModel? mediaSegments) {
resetTimer();
final end = introSkipModel?.intro?.end;
final end = mediaSegments?.intro?.end;
if (end != null) {
ref.read(videoPlayerProvider).seek(end);
}
}
void skipCredits(IntroOutSkipModel? introSkipModel) {
void skipOutro(MediaSegmentsModel? mediaSegments) {
resetTimer();
final end = introSkipModel?.credits?.end;
final end = mediaSegments?.outro?.end;
if (end != null) {
ref.read(videoPlayerProvider).seek(end);
}