From 5f831fa93fd678f0f6f02e6b3cfc607bda92fbb3 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Tue, 26 Apr 2022 19:07:45 -0700
Subject: [PATCH] Reorganize audio player component

---
 .../components/audio-player/AudioPlayer.tsx    | 18 +++++++++---------
 .../audio-player/{ => utils}/listenHandlers.ts |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename src/renderer/components/audio-player/{ => utils}/listenHandlers.ts (98%)

diff --git a/src/renderer/components/audio-player/AudioPlayer.tsx b/src/renderer/components/audio-player/AudioPlayer.tsx
index 45dcdbe..ffd39f9 100644
--- a/src/renderer/components/audio-player/AudioPlayer.tsx
+++ b/src/renderer/components/audio-player/AudioPlayer.tsx
@@ -9,7 +9,7 @@ import {
 import ReactPlayer, { ReactPlayerProps } from 'react-player';
 
 import { Crossfade, PlayerStatus, Song } from '../../../types';
-import { crossfadeHandler, gaplessHandler } from './listenHandlers';
+import { crossfadeHandler, gaplessHandler } from './utils/listenHandlers';
 
 interface AudioPlayerProps extends ReactPlayerProps {
   status: PlayerStatus;
@@ -134,23 +134,23 @@ const AudioPlayer = (
     <>
       <ReactPlayer
         ref={player1Ref}
-        volume={volume}
-        playing={currentPlayer === 1 && status === PlayerStatus.Playing}
-        url={player1?.streamUrl}
         muted={muted}
+        playing={currentPlayer === 1 && status === PlayerStatus.Playing}
         progressInterval={isTransitioning ? 10 : 250}
-        onProgress={type === 'gapless' ? handleGapless1 : handleCrossfade1}
+        url={player1?.streamUrl}
+        volume={volume}
         onEnded={handleOnEnded}
+        onProgress={type === 'gapless' ? handleGapless1 : handleCrossfade1}
       />
       <ReactPlayer
         ref={player2Ref}
-        volume={volume}
-        playing={currentPlayer === 2 && status === PlayerStatus.Playing}
-        url={player2?.streamUrl}
         muted={muted}
+        playing={currentPlayer === 2 && status === PlayerStatus.Playing}
         progressInterval={isTransitioning ? 10 : 250}
-        onProgress={type === 'gapless' ? handleGapless2 : handleCrossfade2}
+        url={player2?.streamUrl}
+        volume={volume}
         onEnded={handleOnEnded}
+        onProgress={type === 'gapless' ? handleGapless2 : handleCrossfade2}
       />
     </>
   );
diff --git a/src/renderer/components/audio-player/listenHandlers.ts b/src/renderer/components/audio-player/utils/listenHandlers.ts
similarity index 98%
rename from src/renderer/components/audio-player/listenHandlers.ts
rename to src/renderer/components/audio-player/utils/listenHandlers.ts
index 4b87f66..5db51c3 100644
--- a/src/renderer/components/audio-player/listenHandlers.ts
+++ b/src/renderer/components/audio-player/utils/listenHandlers.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-nested-ternary */
 import { Dispatch } from 'react';
 
-import { Crossfade } from '../../../types';
+import { Crossfade } from '../../../../types';
 
 export const gaplessHandler = (args: {
   nextPlayerRef: any;