Merge branch 'dango-testing'

.gitattributes

@@ -1 +1,6 @@
 * text=auto
+* text eol=lf
+
+*.png binary
+*.ico binary
+*.icns binary

dmp-core/.gitignore

@@ -1,18 +1,18 @@
-# Rust binary output dir
+# Rust binary output dir
-target/
+target/
-test-config/
+test-config/
-# Rust configuration
+# Rust configuration
-Cargo.lock
+Cargo.lock
-.cargo/
+.cargo/
-
+
-# Database files
+# Database files
-*.db3*
+*.db3*
-music_database*
+music_database*
-
+
-# Storage formats
+# Storage formats
-*.kate-swp*
+*.kate-swp*
-*.m3u
+*.m3u
-*.m3u8
+*.m3u8
-*.json
+*.json
-*.zip
+*.zip
 *.xml

src/App.tsx

@@ -418,6 +418,16 @@ function PlayBar({ playing, setPlaying }: PlayBarProps) {
     invoke('seek', { time: Math.round(val * 1000) }).then()
   };
 
+  const wheelVolume = (event: React.WheelEvent<HTMLDivElement>) => {
+	  let x = volumeSlider.value;
+	  if (event.deltaY < 0) {
+	    volumeSlider.value++;
+	  } else {
+	    volumeSlider.value--;
+	  }
+	  invoke('set_volume', { volume: volumeSlider.value }).then(() => {})
+  };
+
   return (
     <section id="playBar" className="playBar unselectable">
       <div className="seekBar" ref={ seekBarRef } onClick={ seek } onDrag={ seek }>
@@ -436,7 +446,7 @@ function PlayBar({ playing, setPlaying }: PlayBarProps) {
         <div className="bottomRight">
           <button>🔀</button>
           <button>🔁</button>
-          <input type="range" name="volume" id="volumeSlider" onChange={ (volume) => {
+          <input onWheel={wheelVolume} type="range" name="volume" id="volumeSlider" onChange={ (volume) => {
             invoke('set_volume', { volume: volume.target.value }).then(() => {})
           }} />
           <p id="timeDisplay">