Skip to content

Commit

Permalink
fixes for interfaces, freesound fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@charlieroberts
charlieroberts committed May 21, 2016
1 parent 114f49f commit 3909b87
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 43 deletions.
6 changes: 5 additions & 1 deletion css/main2.css
View file
Expand Up @@ -403,7 +403,11 @@ tfoot, thead {
float:right;
}

.CodeMirror { color: white !important; }
.CodeMirror {
color: white !important;
/* font-family: 'Source Code Pro', monospace !important;
font-size:.7em;*/
}
.CodeMirror-scroll { overflow:scroll; }

.login {
Expand Down
9 changes: 6 additions & 3 deletions js/gibber/account.js
View file
Expand Up @@ -223,8 +223,6 @@ module.exports = function( Gibber ) {
var columnNumber = $( '#new_publication_column' ).val(),
column = GE.Layout.columns[ columnNumber ]


console.log( "LANGUAGE IS", column.mode )
$.ajax({
type:"POST",
url: GE.SERVER_URL + '/publish',
Expand Down Expand Up @@ -268,9 +266,14 @@ module.exports = function( Gibber ) {

$.extend( msg.data, revisions )
msg.data.revisionNotes = notes


console.log( 'MSG', msg )
delete msg.data.__proto__
delete msg.__proto__
console.log( 'MSG after', msg, msg.data.__proto__ )
var promise = $.ajax( msg ).then(
function(d) {
console.log( 'file update:', d )
column.fileInfo._rev = d._rev;
column.revision = JSON.stringify( column.fileInfo )
GE.Message.postFlash( msg.data._id.split('/')[2] + ' has been updated.' )
Expand Down
3 changes: 2 additions & 1 deletion js/gibber/gibber_interface.js
View file
Expand Up @@ -22,13 +22,14 @@
callbacks : {},

newPanel : function( column ) {
console.log("NEW INTERFACE PANEL", column )
if( typeof column === 'undefined' ) {
if( Gibber.isInstrument ) {
column = {
bodyElement: $('body')
}
}else{
column = Layout.addColumn()
column = Layout.addColumn({ type:'interface' })
}
}else{
$( column.bodyElement ).empty()
Expand Down
99 changes: 61 additions & 38 deletions js/index.js
View file
Expand Up @@ -417,8 +417,6 @@ module.exports = function( Gibber ) {
var columnNumber = $( '#new_publication_column' ).val(),
column = GE.Layout.columns[ columnNumber ]


console.log( "LANGUAGE IS", column.mode )
$.ajax({
type:"POST",
url: GE.SERVER_URL + '/publish',
Expand Down Expand Up @@ -462,9 +460,14 @@ module.exports = function( Gibber ) {

$.extend( msg.data, revisions )
msg.data.revisionNotes = notes


console.log( 'MSG', msg )
delete msg.data.__proto__
delete msg.__proto__
console.log( 'MSG after', msg, msg.data.__proto__ )
var promise = $.ajax( msg ).then(
function(d) {
console.log( 'file update:', d )
column.fileInfo._rev = d._rev;
column.revision = JSON.stringify( column.fileInfo )
GE.Message.postFlash( msg.data._id.split('/')[2] + ' has been updated.' )
Expand Down Expand Up @@ -30488,7 +30491,7 @@ param **amp** Number. The amplitude to be used to calculate output.
// }
// if( sign !== 0 ) signHistory = sign

return out;
return out * amp;
}
});

Expand Down Expand Up @@ -30623,6 +30626,7 @@ Gibberish.Noise = function() {
this.processProperties(arguments);
};
Gibberish.Noise.prototype = Gibberish._oscillator;

// this file is dependent on oscillators.js

/**#Gibberish.KarplusStrong - Physical Model
Expand Down Expand Up @@ -39937,7 +39941,7 @@ module.exports = function( freesound ) {
//self.setBuffer( buffer )
sampler.isPlaying = true;
//self.buffers[ filename ] = buffer;
Gibberish.audioFiles[sampler.filename] = buffer;
Gibber.Audio.Core.audioFiles[sampler.filename] = buffer;
sampler.buffers[ sampler.filename ] = buffer; //
sampler.file = filename
sampler.send(Master, 1)
Expand Down Expand Up @@ -39999,38 +40003,47 @@ module.exports = function( freesound ) {
);
} else if (typeof key === 'object') {
var query = key.query,
filter = key.filter || "",
sort = key.sort || 'rating_desc',
page = key.page || 0;
pick = key.pick || 0;
filter = key.filter || "",
sort = key.sort || 'rating_desc',
page = key.page || 0;

pick = key.pick || 0

Gibber.log('searching freesound for ' + query)
Gibber.log( 'Searching freesound for ' + query )

filter += ' duration:[0.0 TO 10.0]'
freesound.search(query, page, filter, sort, null, null, null,
function(sounds) {
if (sounds.num_results > 0) {
freesound.textSearch(query, null, // { 'query':query, 'page':page, 'filter':filter, 'sort':sort}, // null, null, null,
function( soundsJSON ) {
console.log( 'soundsJSON', soundsJSON )
var soundsDict = JSON.parse( soundsJSON )
console.log( 'SOUNDS DICT', soundsDict )
if (soundsDict.count > 0) {
var num = 0;

if (typeof key.pick === 'number') {
num = key.pick
} else if (typeof key.pick === 'function') {
num = key.pick();
} else if (key.pick === 'random') {
num = rndi(0, sounds.sounds.length);
num = rndi(0, soundsDict.results.length - 1);
}

filename = sounds.sounds[num].original_filename

var result = soundsDict.results[ num ]
console.log( 'query', result )
filename = result.name

if (typeof Freesound.loaded[filename] === 'undefined') {
request = new XMLHttpRequest();
Gibber.log("now downloading " + filename + ", " + sounds.sounds[num].duration + " seconds in length")
request.open('GET', sounds.sounds[num].serve + "?&api_key=" + freesound.apiKey, true);
request.responseType = 'arraybuffer';
request.onload = function() {
onload(request)
};
request.send();
/*
*request = new XMLHttpRequest();
*Gibber.log("now downloading " + filename + ", " + result.duration + " seconds in length")
*request.open('GET', result.serve + "?&api_key=" + freesound.apiKey, true);
*request.responseType = 'arraybuffer';
*request.onload = function() {
* onload(request)
*};
*request.send();
*/
Freesound.getSoundByID( result.id )
} else {
Gibber.log('using exising loaded sample ' + filename)
sampler.buffer = Freesound.loaded[filename];
Expand All @@ -40053,22 +40066,32 @@ module.exports = function( freesound ) {
}
);
} else if (typeof key === 'number') {
Gibber.log('downloading sound #' + key + ' from freesound.org')
freesound.get_sound(key,
function(sound) {
request = new XMLHttpRequest();
filename = sound.original_filename
request.open('GET', sound.serve + "?api_key=" + freesound.apiKey, true);
request.responseType = 'arraybuffer';
request.onload = function() {
onload(request)
};
request.send();
}
)

Freesound.getSoundByID( id )
}
return sampler;
}
Freesound.getSoundByID = function( id ){
Gibber.log('downloading sound #' + key + ' from freesound.org')
freesound.getSound( key,
function( soundJSON ) {
var soundDict = JSON.parse( soundJSON ),
path = soundDict.previews['preview-hq-mp3']

filename = soundDict.name

request = new XMLHttpRequest();
request.open('GET', path, true);
request.responseType = 'arraybuffer';
request.onload = function() {
onload(request)
};
request.send();
},
function( err ) { console.log( 'ERROR with id', err ) }
)

}
Freesound.loaded = {};

return Freesound
Expand Down Expand Up @@ -65041,7 +65064,7 @@ module.exports = function( Gibber ) {
bodyElement: document.querySelector( 'body' )
}
}else{
column = Layout.addColumn()
column = Layout.addColumn({ type:'interface'})
}
}else{
column.bodyElement.innerHTML = ''
Expand Down

0 comments on commit 3909b87

Please sign in to comment.