Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mmarcon/htm5Hackathon
Browse files Browse the repository at this point in the history
  • Loading branch information
mmarcon committed May 5, 2012
2 parents c007726 + 5034355 commit 97b345c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion app/audio.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ var Audio = (function() {
source.playbackRate.value = 1.0;

panner.setPosition(0, 0, 0);

source.looping = true;

return {
Expand All @@ -91,7 +92,7 @@ var Audio = (function() {
x = Math.cos(localOrientation) * 4,
y = Math.sin(localOrientation) * 4;
self.context.listener.setOrientation(x, y, 0, 0, 0, 1);
self.context.listener.setPosition(listener.lng, listener.lat, 0);
self.context.listener.setPosition(listener.lng*100, listener.lat*100, 0);
};

self.getCurrentTime = function() {
Expand Down
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
for (var i = 0; i < Math.min(5, fs.sounds.length); i++) {
fsAudio[i] = Audio.createSource();
Audio.setAudioSource(fsAudio[i], fs.sounds[i]['preview-hq-mp3']);
fsAudio[i].panner.setPosition(fs.sounds[i]['geotag'].lon, fs.sounds[i]['geotag'].lat,0);
fsAudio[i].panner.setPosition(fs.sounds[i]['geotag'].lon*100, fs.sounds[i]['geotag'].lat*100,0);
var marker = new nokia.maps.map.StandardMarker({latitude: fs.sounds[i]['geotag'].lat, longitude: fs.sounds[i]['geotag'].lon});
marker.text = fs.sounds[i]['tags'].join(', ');
marker.coord = {latitude: fs.sounds[i]['geotag'].lat, longitude: fs.sounds[i]['geotag'].lon};
Expand Down

0 comments on commit 97b345c

Please sign in to comment.