1 files changed, 44 insertions, 30 deletions
diff --git a/midi-dump.hs b/midi-dump.hs
index 064ce88..4c74792 100644
--- a/midi-dump.hs
+++ b/midi-dump.hs
@@ -75,38 +75,51 @@ getAbsTime = do
  return $ now - startTime + startTimeReal
 createTable :: Query
-createTable = fromString $ concat
+createTable = fromString . concat $
-  ["CREATE TABLE IF NOT EXISTS axis_input",
+  [ "CREATE TABLE IF NOT EXISTS axis_input"
-  " (id INTEGER PRIMARY KEY,",
+  , " (id INTEGER PRIMARY KEY,"
+  , " start_sec INTEGER,"
-  " start_sec INTEGER,",
+  , " start_nsec INTEGER,"
-  " start_nsec INTEGER,",
+  , " end_sec INTEGER,"
-  " end_sec INTEGER,",
+  , " end_nsec INTEGER,"
-  " end_nsec INTEGER,",
+  , " first_sec INTEGER,"
+  , " first_nsec INTEGER,"
-  " first_sec INTEGER,",
+  , " last_sec INTEGER,"
-  " first_nsec INTEGER,",
+  , " last_nsec INTEGER,"
-  " last_sec INTEGER,",
+  , " midi BLOB)"
-  " last_nsec INTEGER,",
+  ]
-  " midi BLOB)"]
 sqlInsert :: Query
-sqlInsert = fromString $ concat
+sqlInsert = fromString . concat $
-  ["INSERT INTO axis_input",
+  [ "INSERT INTO axis_input "
+  , "(start_sec,"
-  "(start_sec,",
+  , " start_nsec,"
-  " start_nsec,",
+  , " end_sec,"
-  " end_sec,",
+  , " end_nsec,"
-  " end_nsec,",
+  , " first_sec,"
+  , " first_nsec,"
-  " first_sec,",
+  , " last_sec,"
-  " first_nsec,",
+  , " last_nsec,"
-  " last_sec,",
+  , " midi)"
-  " last_nsec,",
+  , "VALUES (?,?,?,?, ?,?,?,?, ?)"
+  ]
-  " midi)",
-  "VALUES (?,?,?,?, ?,?,?,?, ?)"]
+sqlSelectEVERYTHING :: MidiController [CompleteRecording]
+sqlSelectEVERYTHING = do
+  conn <- asks _sqlite
+  liftIO $ query_ conn $ fromString . concat $
+    [ "SELECT "
+    , "start_sec,"
+    , "start_nsec,"
+    , "end_sec,"
+    , "end_nsec,"
+    , "first_sec,"
+    , "first_nsec,"
+    , "last_sec,"
+    , "last_nsec,"
+    , "midi"
+    , " FROM axis_input ORDER BY start_sec, start_nsec;"
+    ]
 main' :: IO ()
 main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do
@@ -176,6 +189,7 @@ processCommand :: String -> MidiController ()
 processCommand "exit" = modify $ \s -> s { _wantExit = True }
 -- processCommand "" = return ()
 processCommand "" = gets _replay >>= playRecording
+processCommand "dump" = sqlSelectEVERYTHING >>= playRecording . mconcat
 processCommand "C" = do
  let notes = (Event.NoteEv Event.NoteOn . mkNote) <$> [60, 64, 67]
  forM_ notes (delayNoteEv (TimeSpec 0 0))

diff --git a/midi-dump.hs b/midi-dump.hs index 064ce88..4c74792 100644 --- a/midi-dump.hs +++ b/midi-dump.hs
@@ -75,38 +75,51 @@ getAbsTime = do
75	return $ now - startTime + startTimeReal	75	return $ now - startTime + startTimeReal
76		76
77	createTable :: Query	77	createTable :: Query
78	createTable = fromString $ concat	78	createTable = fromString . concat $
79	["CREATE TABLE IF NOT EXISTS axis_input",	79	[ "CREATE TABLE IF NOT EXISTS axis_input"
80	" (id INTEGER PRIMARY KEY,",	80	, " (id INTEGER PRIMARY KEY,"
81		81	, " start_sec INTEGER,"
82	" start_sec INTEGER,",	82	, " start_nsec INTEGER,"
83	" start_nsec INTEGER,",	83	, " end_sec INTEGER,"
84	" end_sec INTEGER,",	84	, " end_nsec INTEGER,"
85	" end_nsec INTEGER,",	85	, " first_sec INTEGER,"
86		86	, " first_nsec INTEGER,"
87	" first_sec INTEGER,",	87	, " last_sec INTEGER,"
88	" first_nsec INTEGER,",	88	, " last_nsec INTEGER,"
89	" last_sec INTEGER,",	89	, " midi BLOB)"
90	" last_nsec INTEGER,",	90	]
91
92	" midi BLOB)"]
93		91
94	sqlInsert :: Query	92	sqlInsert :: Query
95	sqlInsert = fromString $ concat	93	sqlInsert = fromString . concat $
96	["INSERT INTO axis_input",	94	[ "INSERT INTO axis_input "
97		95	, "(start_sec,"
98	"(start_sec,",	96	, " start_nsec,"
99	" start_nsec,",	97	, " end_sec,"
100	" end_sec,",	98	, " end_nsec,"
101	" end_nsec,",	99	, " first_sec,"
102		100	, " first_nsec,"
103	" first_sec,",	101	, " last_sec,"
104	" first_nsec,",	102	, " last_nsec,"
105	" last_sec,",	103	, " midi)"
106	" last_nsec,",	104	, "VALUES (?,?,?,?, ?,?,?,?, ?)"
107		105	]
108	" midi)",	106
109	"VALUES (?,?,?,?, ?,?,?,?, ?)"]	107	sqlSelectEVERYTHING :: MidiController [CompleteRecording]
		108	sqlSelectEVERYTHING = do
		109	conn <- asks _sqlite
		110	liftIO $ query_ conn $ fromString . concat $
		111	[ "SELECT "
		112	, "start_sec,"
		113	, "start_nsec,"
		114	, "end_sec,"
		115	, "end_nsec,"
		116	, "first_sec,"
		117	, "first_nsec,"
		118	, "last_sec,"
		119	, "last_nsec,"
		120	, "midi"
		121	, " FROM axis_input ORDER BY start_sec, start_nsec;"
		122	]
110		123
111	main' :: IO ()	124	main' :: IO ()
112	main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do	125	main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do
@@ -176,6 +189,7 @@ processCommand :: String -> MidiController ()
176	processCommand "exit" = modify $ \s -> s { _wantExit = True }	189	processCommand "exit" = modify $ \s -> s { _wantExit = True }
177	-- processCommand "" = return ()	190	-- processCommand "" = return ()
178	processCommand "" = gets _replay >>= playRecording	191	processCommand "" = gets _replay >>= playRecording
		192	processCommand "dump" = sqlSelectEVERYTHING >>= playRecording . mconcat
179	processCommand "C" = do	193	processCommand "C" = do
180	let notes = (Event.NoteEv Event.NoteOn . mkNote) <$> [60, 64, 67]	194	let notes = (Event.NoteEv Event.NoteOn . mkNote) <$> [60, 64, 67]
181	forM_ notes (delayNoteEv (TimeSpec 0 0))	195	forM_ notes (delayNoteEv (TimeSpec 0 0))