osx fixes

patterns/berlin.pat

@@ -1,21 +1,11 @@
 {
   "name": "berlin",
   "repeat": 1,
-  "resolution": 8,
+  "resolution": 4,
   "xsize": 16,
   "ysize": 6,
   "sounds": {
-    "1,3": {
-      "name": "hihiat_closed.wav",
-      "location": "media/cc0/hihiat_closed.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "8,1": {
+    "0,1": {
       "name": "kick_low.wav",
       "location": "media/cc0/kick_low.wav",
       "volume": 1.0,
@@ -25,16 +15,6 @@
       "speed": 1.0,
       "reverse": false
     },
-    "13,3": {
-      "name": "hihiat_closed.wav",
-      "location": "media/cc0/hihiat_closed.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0,
-      "speed": 1.0,
-      "reverse": false
-    },
     "11,3": {
       "name": "hihiat_closed.wav",
       "location": "media/cc0/hihiat_closed.wav",
@@ -45,17 +25,17 @@
       "speed": 1.0,
       "reverse": false
     },
-    "0,4": {
-      "name": "bass_303.wav",
-      "location": "media/cc0/bass/bass_303.wav",
+    "6,2": {
+      "name": "snare_sharp.wav",
+      "location": "media/cc0/snare_sharp.wav",
       "volume": 1.0,
       "roll": 0,
       "rollrate": 0,
       "trim": 0,
-      "speed": 0.960125,
+      "speed": 1.0,
       "reverse": false
     },
-    "10,1": {
+    "2,1": {
       "name": "kick_low.wav",
       "location": "media/cc0/kick_low.wav",
       "volume": 1.0,
@@ -65,7 +45,7 @@
       "speed": 1.0,
       "reverse": false
     },
-    "6,2": {
+    "14,2": {
       "name": "snare_sharp.wav",
       "location": "media/cc0/snare_sharp.wav",
       "volume": 1.0,
@@ -75,9 +55,9 @@
       "speed": 1.0,
       "reverse": false
     },
-    "14,1": {
-      "name": "kick_low.wav",
-      "location": "media/cc0/kick_low.wav",
+    "10,2": {
+      "name": "snare_sharp.wav",
+      "location": "media/cc0/snare_sharp.wav",
       "volume": 1.0,
       "roll": 0,
       "rollrate": 0,
@@ -95,9 +75,9 @@
       "speed": 1.0,
       "reverse": false
     },
-    "2,1": {
-      "name": "kick_low.wav",
-      "location": "media/cc0/kick_low.wav",
+    "9,3": {
+      "name": "hihiat_closed.wav",
+      "location": "media/cc0/hihiat_closed.wav",
       "volume": 1.0,
       "roll": 0,
       "rollrate": 0,
@@ -105,9 +85,9 @@
       "speed": 1.0,
       "reverse": false
     },
-    "15,3": {
-      "name": "hihiat_closed.wav",
-      "location": "media/cc0/hihiat_closed.wav",
+    "4,1": {
+      "name": "kick_low.wav",
+      "location": "media/cc0/kick_low.wav",
       "volume": 1.0,
       "roll": 0,
       "rollrate": 0,
@@ -125,7 +105,7 @@
       "speed": 1.0,
       "reverse": false
     },
-    "6,1": {
+    "14,1": {
       "name": "kick_low.wav",
       "location": "media/cc0/kick_low.wav",
       "volume": 1.0,
@@ -135,7 +115,7 @@
       "speed": 1.0,
       "reverse": false
     },
-    "9,3": {
+    "5,3": {
       "name": "hihiat_closed.wav",
       "location": "media/cc0/hihiat_closed.wav",
       "volume": 1.0,
@@ -145,9 +125,9 @@
       "speed": 1.0,
       "reverse": false
     },
-    "10,2": {
-      "name": "snare_sharp.wav",
-      "location": "media/cc0/snare_sharp.wav",
+    "15,3": {
+      "name": "hihiat_closed.wav",
+      "location": "media/cc0/hihiat_closed.wav",
       "volume": 1.0,
       "roll": 0,
       "rollrate": 0,
@@ -155,7 +135,7 @@
       "speed": 1.0,
       "reverse": false
     },
-    "5,3": {
+    "3,3": {
       "name": "hihiat_closed.wav",
       "location": "media/cc0/hihiat_closed.wav",
       "volume": 1.0,
@@ -165,7 +145,7 @@
       "speed": 1.0,
       "reverse": false
     },
-    "3,3": {
+    "1,3": {
       "name": "hihiat_closed.wav",
       "location": "media/cc0/hihiat_closed.wav",
       "volume": 1.0,
@@ -175,7 +155,17 @@
       "speed": 1.0,
       "reverse": false
     },
-    "4,1": {
+    "0,4": {
+      "name": "bass_303.wav",
+      "location": "media/cc0/bass/bass_303.wav",
+      "volume": 1.0,
+      "roll": 0,
+      "rollrate": 0,
+      "trim": 0,
+      "speed": 0.960125,
+      "reverse": false
+    },
+    "6,1": {
       "name": "kick_low.wav",
       "location": "media/cc0/kick_low.wav",
       "volume": 1.0,
@@ -185,9 +175,9 @@
       "speed": 1.0,
       "reverse": false
     },
-    "2,2": {
-      "name": "snare_sharp.wav",
-      "location": "media/cc0/snare_sharp.wav",
+    "8,1": {
+      "name": "kick_low.wav",
+      "location": "media/cc0/kick_low.wav",
       "volume": 1.0,
       "roll": 0,
       "rollrate": 0,
@@ -195,7 +185,7 @@
       "speed": 1.0,
       "reverse": false
     },
-    "0,1": {
+    "10,1": {
       "name": "kick_low.wav",
       "location": "media/cc0/kick_low.wav",
       "volume": 1.0,
@@ -205,7 +195,17 @@
       "speed": 1.0,
       "reverse": false
     },
-    "14,2": {
+    "13,3": {
+      "name": "hihiat_closed.wav",
+      "location": "media/cc0/hihiat_closed.wav",
+      "volume": 1.0,
+      "roll": 0,
+      "rollrate": 0,
+      "trim": 0,
+      "speed": 1.0,
+      "reverse": false
+    },
+    "2,2": {
       "name": "snare_sharp.wav",
       "location": "media/cc0/snare_sharp.wav",
       "volume": 1.0,

patterns/polka.pat

@@ -1,29 +0,0 @@
-{
-  "name": "polka",
-  "repeat": 0,
-  "bpm": 120,
-  "xsize": 8,
-  "ysize": 1,
-  "sounds": {
-    "0,0": {
-      "name": "ride_crisp.wav",
-      "location": "media\\cc0\\ride_crisp.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0
-    },
-    "6,0": {
-      "name": "ride_crisp.wav",
-      "location": "media\\cc0\\ride_crisp.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0
-    }
-  }
-}

patterns/test w bass.pat

@@ -1,339 +0,0 @@
-{
-  "name": "test w bass",
-  "repeat": 2,
-  "bpm": 396,
-  "xsize": 16,
-  "ysize": 6,
-  "sounds": {
-    "0,4": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "8,4": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.74,
-      "reverse": false
-    },
-    "3,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.63,
-      "reverse": false
-    },
-    "11,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.08,
-      "reverse": false
-    },
-    "10,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "5,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.63,
-      "reverse": false
-    },
-    "4,1": {
-      "name": "snare_deep.wav",
-      "location": "media\\cc0\\snare_deep.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "0,0": {
-      "name": "kick_rough.wav",
-      "location": "media\\cc0\\kick_rough.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "14,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "12,4": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.74,
-      "reverse": false
-    },
-    "1,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.63,
-      "reverse": false
-    },
-    "10,4": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.74,
-      "reverse": false
-    },
-    "10,0": {
-      "name": "kick_rough.wav",
-      "location": "media\\cc0\\kick_rough.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "8,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "9,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.63,
-      "reverse": false
-    },
-    "12,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "15,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.63,
-      "reverse": false
-    },
-    "2,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "11,0": {
-      "name": "kick_rough.wav",
-      "location": "media\\cc0\\kick_rough.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "13,4": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.74,
-      "reverse": false
-    },
-    "4,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "0,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "7,0": {
-      "name": "kick_rough.wav",
-      "location": "media\\cc0\\kick_rough.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "12,1": {
-      "name": "snare_deep.wav",
-      "location": "media\\cc0\\snare_deep.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "2,4": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "13,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.63,
-      "reverse": false
-    },
-    "4,4": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "7,5": {
-      "name": "bass_1.wav",
-      "location": "media/cc0/bass/bass_1.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 0.63,
-      "reverse": false
-    },
-    "1,0": {
-      "name": "kick_rough.wav",
-      "location": "media\\cc0\\kick_rough.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "6,2": {
-      "name": "hihiat_real.wav",
-      "location": "media\\cc0\\hihiat_real.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    }
-  }
-}

patterns/test.pat

@@ -1,42 +0,0 @@
-{
-  "name": "test",
-  "repeat": 0,
-  "bpm": 120,
-  "xsize": 9,
-  "ysize": 1,
-  "sounds": {
-    "2,0": {
-      "name": "snare_punchy.wav",
-      "location": "media/cc0/snare_punchy.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "4,0": {
-      "name": "snare_punchy.wav",
-      "location": "media/cc0/snare_punchy.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    },
-    "0,0": {
-      "name": "snare_punchy.wav",
-      "location": "media/cc0/snare_punchy.wav",
-      "volume": 1.0,
-      "roll": 0,
-      "rollrate": 0,
-      "trim": 0.0,
-      "active": false,
-      "speed": 1.0,
-      "reverse": false
-    }
-  }
-}

sampler.ini

@@ -1,55 +0,0 @@
-[Window][Debug##Default]
-Pos=60,60
-Size=400,400
-Collapsed=0
-
-[Window][Hello world]
-Pos=41,122
-Size=300,100
-Collapsed=0
-
-[Window][sources]
-Pos=766,-59
-Size=454,1018
-Collapsed=0
-
-[Window][ImGui Demo]
-Pos=297,1
-Size=550,680
-Collapsed=0
-
-[Window][sequence]
-Pos=46,63
-Size=300,100
-Collapsed=0
-
-[Window][bar]
-Pos=42,156
-Size=328,168
-Collapsed=0
-
-[Window][sound]
-Pos=164,22
-Size=423,386
-Collapsed=0
-
-[Window][tracks]
-Pos=175,1015
-Size=300,160
-Collapsed=0
-
-[Window][pattern]
-Pos=39,383
-Size=999,547
-Collapsed=0
-
-[Window][patterns]
-Pos=736,93
-Size=414,352
-Collapsed=0
-
-[Window][settings]
-Pos=83,81
-Size=300,160
-Collapsed=0
-

src/base.rs

@@ -331,7 +331,7 @@ impl Pattern {
             Ok(f) => {
                 serde_json::from_reader(BufReader::new(f))
                     .map_err(|e| {
-                        dbg!(&e);
+                        error!("Could not load {} because {}", file.to_string_lossy(), e);
                         e.to_string()
                     })
                     .map(|mut p: Pattern| p.reload_sounds())

src/support_ogl/mod.rs

@@ -42,8 +42,15 @@ pub fn init(title: &str) -> System {
         }
     }
 
-    // let hidpi_factor = platform.hidpi_factor();
-    // dbg!(hidpi_factor);
+
+    #[cfg(target_os = "macos")]{
+        dbg!("unix");
+        if dpi  ==  2.0 {
+            dpi = 1.0;
+        }
+    }
+    let hidpi_factor = platform.hidpi_factor();
+    dbg!(hidpi_factor);
     let font_size = (16.0 * dpi) as f32;
     imgui.fonts().add_font(&[
         FontSource::TtfData {