Merge pull request #34 from jamiefaye/dev

Dev
jamiefaye · Apr 20, 2019 · 4aa8946 · 4aa8946
2 parents 272ca9c + 8ca9774
commit 4aa8946
Show file tree

Hide file tree

Showing 22 changed files with 501 additions and 294 deletions.
diff --git a/DR/midian/edit.css b/DR/midian/edit.css
@@ -96,11 +96,13 @@ div.trnote {
 div.kitlab {
 	position: absolute;
 	font-size: 7pt;
+	user-select: none;
 }
 
 div.notelab {
 	position: absolute;
 	font-size: 9pt;
+	user-select: none;
 }
 
 div.notelabsimp {
@@ -116,6 +118,7 @@ div.parmlab {
 	left: 2px;
 }
 
+
 div.trkitnote {
 	position: absolute;
 	height: 8px;
@@ -173,6 +176,12 @@ div.paramrun {
 	background-color:#202020;
 }
 
+div.paramconst {
+	position: relative;
+	background-color:#fffff0;
+	font-size: 7pt;
+}
+
 .plotspot, .parmplot {
 	padding:0%;
 	margin: 0%;
@@ -472,6 +481,10 @@ height: 28px;
 min-height: 28px;
 }
 
+.tinybutn {
+	padding: 1px;
+}
+
 #hiddenfileopener
 {
     display:none;
@@ -497,7 +510,7 @@ min-height: 28px;
 
 
 td.simplechan {
-	width: 8px;
+	width: 40px;
 	text-align: left;
 	font-size: 18px;
 
@@ -517,6 +530,13 @@ table.simplehead {
   	border: 1px;
 }
 
+span.simplepatch {
+  text-align: left;
+  font-size: 14px;
+  border: none;
+  	border: 1px;
+}
+
 td.simpleplot {
 	border: none;
 	padding-left: 4px;
@@ -527,3 +547,8 @@ td.simpleplot {
 }
 
 
+div.selbox {
+	background-color: gray;
+	position: absolute;
+	opacity: 0.2;
+}
diff --git a/DR/midian/img/menu-up.png b/DR/midian/img/menu-up.png
diff --git a/DR/midian/index.htm b/DR/midian/index.htm
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1, maximum-scale=1, user-scalable=no">
+		<meta charset="UTF-8">
+		<title>Midian</title>
+<!-- https://stackoverflow.com/questions/951791/javascript-global-error-handling -->
+<div id="npoptemp" style="display: none;"></div>
+<script type="text/javascript">
+
+window.onerror = function(msg, url, line, col, error) {
+   var extra = !col ? '' : '\ncolumn: ' + col;
+   extra += !error ? '' : '\nerror: ' + error;
+   alert("Error: " + msg + "\nurl: " + url + "\nline: " + line + extra);
+   return true;
+};
+
+var buildType='mpc';
+</script>
+<link rel="stylesheet" href="filewidget.css">
+<link rel="stylesheet" href="edit.css">
+<link rel="stylesheet" href="midian.css">
+
+	</head>
+	<body>
+This program converts Midi-format files into mpcpattern files for the Akai Force and other Akai products.
+<p>
+To use this program, press the "Choose File" button and select a Midi file to work with. You will then see one or more Midi tracks displayed graphically. To convert a track into a mpcpattern, click on the "+ MPC" button and the track will be converted and downloaded.
+<p>
+<table class='nobord'><tr>
+<td><input id='midiopenlocal' name="file" type="file" accept=".mid,.MID,.midi"/></td>
+</tr>
+</table>
+		</div>
+		<div id='popupspot'></div>
+		<p class='tinygap'/>
+	<div id='midiview'>
+	</div>
+
+	<div id='docspot'>
+	</div>
+	<div id='midiantab'>
+	</div>
+
+	<ul>
+		<li>You can select a subset of a track to extract by clicking and dragging.</li>
+		<li>At present, the program only converts Note On/Note Off events.</li>
+		<li>The Midi file you choose and the mpcpattern file are processed entirely on your own computer. No information about it is sent anywhere else.</li>
+		<li>The program is experimental and no liability is assumed for bugs, crashes, etc. by Catnip or Akai Professional.
+	</ul>
+© 2019 Catnip/Jamie Faye Fenton.
+<script src="midian.js"></script>
+</body>
+</html>
diff --git a/DR/midian/index.html b/DR/midian/index.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1, maximum-scale=1, user-scalable=no">
+		<meta charset="UTF-8">
+		<title>Midian</title>
+<!-- https://stackoverflow.com/questions/951791/javascript-global-error-handling -->
+<div id="npoptemp" style="display: none;"></div>
+<script type="text/javascript">
+<!--
+window.onerror = function(msg, url, line, col, error) {
+   var extra = !col ? '' : '\ncolumn: ' + col;
+   extra += !error ? '' : '\nerror: ' + error;
+   alert("Error: " + msg + "\nurl: " + url + "\nline: " + line + extra);
+   return true;
+};
+-->
+
+var buildType = 'web';
+</script>
+<link rel="stylesheet" href="edit.css">
+<link rel="stylesheet" href="midian.css">
+</head>
+<body>
+This program converts Midi-format files into Synthstrom Deluge SONG.XML files.<p>
+This beta version also allows you to convert SONG.XML files into Midi-format files.
+<p>
+To use this program, press the "Choose File" button and select a Midi file to work with. You will then see one or more Midi tracks displayed graphically. To add a track, click on the "+ Song" button and the track will be converted and appended. The "+ Midi" button does the opposite.<p>
+
+		<div id='filegroupplace'>
+			<table class='nobord'><tr>
+			<td>Midi File:</td>
+			<td><input id='midiopenlocal' name="file" type="file" accept=".mid,.MID,.midi"/></td>
+			<td><input id='mididownload' type="button" value="Download" style="width:55pt" ></td>
+			</tr>
+			</table>
+		</div>
+		<div id='popupspot'></div>
+		<p class='tinygap'/>
+	<div id='midiview'>
+	</div>
+	<hr>
+
+<hr>
+	<div id='midiantab'>
+	</div>
+	<div id='filegroupsong'>
+		<table class='nobord'><tr>
+			<td>Song File:</td>
+			<td><input id='songopenlocal' name="file" type="file" accept=".xml,.XML" value='Open Song'/></td>
+			<td><input id='songdownload' type="button" value="Download" style="width:55pt" ></td>
+			<td><input id='songconvert' type="button" value="Convert" style="width:55pt" ></td>
+		</tr></table>
+	</div>
+	<div id='docspot'>
+	</div>
+<hr>
+	<ul>
+		<li>Download the updated song by clicking on the Download button at the bottom.</li>
+		<li>Download the updated Midi file by clicking on the Download button at the top.</li>
+		<li>To add to an existing song or midi document, open it with the "Choose File" button.</li>
+		<li>Select a subset of a track to extract by clicking and dragging.</li>
+		<li>The "Convert" button converts the entire arrangement into a group of Midi tracks. If there isn't an arrangement, it converts each track individually.
+		<li>The "&rarr; Clip" button puts the midi track data on the clipboard. You can then paste it into the <a href="../xmlView/index.html">main XML viewer program.</a></li> 
+		<li>At present, the program only converts Note On/Note Off events.</li>
+		<li>The Midi file you choose and the SONG.XML file are processed entirely on your own computer. No information about it is sent anywhere else.</li>
+		<li>The program is experimental and no liability is assumed for bugs, crashes, etc. by Catnip or Synthstrom Audible.
+	</ul>
+<hr>
+© 2019 Catnip/Jamie Faye Fenton.
+<script src="midian.js"></script>
+</body>
+</html>
diff --git a/DR/midian/midian.htm b/DR/midian/midian.htm
@@ -15,7 +15,7 @@
    return true;
 };
 -->
-
+var buildType = 'flashair';
 </script>
 <link rel="stylesheet" href="filewidget.css">
 <link rel="stylesheet" href="edit.css">
@@ -25,33 +25,37 @@
 	<body>
 		<div id='filegroupplace'>
 			<table id='filegroup' class='nobord'><tr>
-				<td><button id="openmidibutn" class="butn openmidibutn" title="openmidi">Open Midi</button></td>
-				<td><button id="upbut" class="butn upbut" title="upbutn">&#x2191;</button></td>
-				<td><button id="downbut" class="butn downbut" title="dnbutn">&#x2193;</button></td>
-				<td><div id="statind" style='font-size: 9pt'></div></td>
+				<td><button id="midiopen" class="butn openmidibutn" title="openmidi">Open Midi</button></td>
+				<td><button id="midiupbut" class="butn upbut" title="upbutn">&#x2191;</button></td>
+				<td><button id="mididwnbut" class="butn downbut" title="dnbutn">&#x2193;</button></td>
+				<td><button id="midisave" class="butn savebut" title="save">Save Midi</button></td>
+				<td><button id='mididownload' class='butn downlbut' title="download">Download Midi</button></td>
+				<td><div id="midistatus" style='font-size: 9pt'></div></td>
 				</tr>
 			</table>
 		</div>
 		<div id='popupspot'></div>
 		<p class='tinygap'/>
 	<div id='midiview'>
 	</div>
+
+	<p class='tinygap'/>
+
 
-	<div id='docspot'>
-	</div>
-	<div id='midiantab'>
-	</div>
 	<div id='filegroupsong'>
-		<table id='filegroup2' class='nobord'><tr>
-			<td><button id="opensongbutn" class="butn opensongbutn" title="open">Open Song</button></td>
-			<td><button id="savebut" class="butn savebut" title="save">Save Song</button></td>
-			<td><button id='downloadbut' class='butn downlbut' title="download">Download Song</button></td>
-			<td><div id="statind2" style='font-size: 9pt'></div></td>
-		</tr>
-		</table>
-	</div>
-<div id='songiew'>
-</div>
+			<table id='filegroup2' class='nobord'><tr>
+				<td><button id="songopen" class="butn opensongbutn" title="opensong">Open Song</button></td>
+				<td><button id="songupbut" class="butn upbut" title="upbutn">&#x2191;</button></td>
+				<td><button id="songdwnbut" class="butn downbut" title="dnbutn">&#x2193;</button></td>
+				<td><button id="songsave" class="butn savebut" title="save">Save song</button></td>
+				<td><button id='songdownload' class='butn downlbut' title="download">Download Song</button></td>
+				<td><button id='songconvert' class='butn' title="Convert All">Convert</td>
+				<td><div id="songstatus" style='font-size: 9pt'></div></td>
+				</tr>
+			</table>
+		</div>
+	<div id='docspot'>
+
 <script src="midian.js"></script>
 </body>
 </html>
diff --git a/DR/midian/midian.js b/DR/midian/midian.js
diff --git a/DR/waverly/viewWAV.htm b/DR/waverly/viewWAV.htm
@@ -21,10 +21,6 @@
 <link rel="stylesheet" href="edit.css">
 	</head>
 	<body>
-		<div id='instructions'>
- 			This is the web-based version of the Waverly WAV Sound Editor.<p>
-			To use this program, press the "Choose File" button and select an WAV file to work with. To save your result, press the Download button.
-		</div>
 		<div id='filegroupplace'>
 			<table id='filegroup' class='nobord'><tr>
 				<td><button id="openbutn" class="butn openbutn" title="open">Open</button></td>

diff --git a/DR/xmlView/edit.css b/DR/xmlView/edit.css
@@ -96,11 +96,13 @@ div.trnote {
 div.kitlab {
 	position: absolute;
 	font-size: 7pt;
+	user-select: none;
 }
 
 div.notelab {
 	position: absolute;
 	font-size: 9pt;
+	user-select: none;
 }
 
 div.notelabsimp {
@@ -116,6 +118,7 @@ div.parmlab {
 	left: 2px;
 }
 
+
 div.trkitnote {
 	position: absolute;
 	height: 8px;
@@ -173,6 +176,12 @@ div.paramrun {
 	background-color:#202020;
 }
 
+div.paramconst {
+	position: relative;
+	background-color:#fffff0;
+	font-size: 7pt;
+}
+
 .plotspot, .parmplot {
 	padding:0%;
 	margin: 0%;
@@ -472,6 +481,10 @@ height: 28px;
 min-height: 28px;
 }
 
+.tinybutn {
+	padding: 1px;
+}
+
 #hiddenfileopener
 {
     display:none;
@@ -497,7 +510,7 @@ min-height: 28px;
 
 
 td.simplechan {
-	width: 8px;
+	width: 40px;
 	text-align: left;
 	font-size: 18px;
 
@@ -517,6 +530,13 @@ table.simplehead {
   	border: 1px;
 }
 
+span.simplepatch {
+  text-align: left;
+  font-size: 14px;
+  border: none;
+  	border: 1px;
+}
+
 td.simpleplot {
 	border: none;
 	padding-left: 4px;
@@ -527,3 +547,8 @@ td.simpleplot {
 }
 
 
+div.selbox {
+	background-color: gray;
+	position: absolute;
+	opacity: 0.2;
+}
diff --git a/DR/xmlView/img/menu-down.png b/DR/xmlView/img/menu-down.png
diff --git a/DR/xmlView/img/menu-up.png b/DR/xmlView/img/menu-up.png
diff --git a/DR/xmlView/viewXML.js b/DR/xmlView/viewXML.js
diff --git a/midian/src/midian.js b/midian/src/midian.js
@@ -91,7 +91,7 @@ function onLoad()
 		defaultDir: "/SONGS/",
 		dataType: "text",
 		load:  function(theData, fname, manager, fromViewer) { // (theData, fname, me, me.homeDoc); constructor(fname, text, newKitFlag, simple) 
-			let homeViewer = makeDelugeDoc(fname, theData, false, true, transTrackToMidi);
+			let homeViewer = makeDelugeDoc(fname, theData, {transTrack: transTrackToMidi});
 			setFocusDoc(homeViewer);
 			manager.homeDoc = homeViewer;
 			$('#songview').append(homeViewer.html);
@@ -106,7 +106,7 @@ function onLoad()
 	});
 	if (buildType !== 'mpc') {
 		let data = empty_song_template();
-		let homeSong = makeDelugeDoc("SONG.XML", data, false, true, transTrackToMidi);
+		let homeSong = makeDelugeDoc("SONG.XML", data, {transTrack: transTrackToMidi, viewer: 'midian'});
 		songManager.homeDoc = homeSong;
 		setFocusDoc(homeSong);
 	}

diff --git a/waverly/html/viewWAV.htm b/waverly/html/viewWAV.htm
@@ -21,10 +21,6 @@
 <link rel="stylesheet" href="edit.css">
 	</head>
 	<body>
-		<div id='instructions'>
- 			This is the web-based version of the Waverly WAV Sound Editor.<p>
-			To use this program, press the "Choose File" button and select an WAV file to work with. To save your result, press the Download button.
-		</div>
 		<div id='filegroupplace'>
 			<table id='filegroup' class='nobord'><tr>
 				<td><button id="openbutn" class="butn openbutn" title="open">Open</button></td>