diff --git a/ruby/lib/jam_ruby/jam_track_importer.rb b/ruby/lib/jam_ruby/jam_track_importer.rb index 71eae6fae..c6a6549b3 100644 --- a/ruby/lib/jam_ruby/jam_track_importer.rb +++ b/ruby/lib/jam_ruby/jam_track_importer.rb @@ -3276,7 +3276,7 @@ module JamRuby meta = load_metalocation(metalocation) - if meta.nil? && is_tency_storage? + if meta.nil? && is_paris_storage? raise "no tency song matching this metalocation #{metalocation}" end jam_track_importer = nil diff --git a/web/app/assets/images/landing/arrow-jamblaster-order.png b/web/app/assets/images/landing/arrow-jamblaster-order.png new file mode 100644 index 000000000..50e0495ec Binary files /dev/null and b/web/app/assets/images/landing/arrow-jamblaster-order.png differ diff --git a/web/app/assets/images/landing/broadcast_video.png b/web/app/assets/images/landing/broadcast_video.png new file mode 100644 index 000000000..b3a281b60 Binary files /dev/null and b/web/app/assets/images/landing/broadcast_video.png differ diff --git a/web/app/assets/images/landing/find_musicians.png b/web/app/assets/images/landing/find_musicians.png new file mode 100644 index 000000000..b2160ba9d Binary files /dev/null and b/web/app/assets/images/landing/find_musicians.png differ diff --git a/web/app/assets/images/landing/online_lessons.png b/web/app/assets/images/landing/online_lessons.png new file mode 100644 index 000000000..7e4da04ec Binary files /dev/null and b/web/app/assets/images/landing/online_lessons.png differ diff --git a/web/app/assets/images/landing/phone_control_jamblaster.png b/web/app/assets/images/landing/phone_control_jamblaster.png new file mode 100644 index 000000000..4b28201e1 Binary files /dev/null and b/web/app/assets/images/landing/phone_control_jamblaster.png differ diff --git a/web/app/assets/images/landing/preorder_jamblaster.png b/web/app/assets/images/landing/preorder_jamblaster.png new file mode 100644 index 000000000..932f2089e Binary files /dev/null and b/web/app/assets/images/landing/preorder_jamblaster.png differ diff --git a/web/app/assets/images/landing/recording_with_video.png b/web/app/assets/images/landing/recording_with_video.png new file mode 100644 index 000000000..b07fbe180 Binary files /dev/null and b/web/app/assets/images/landing/recording_with_video.png differ diff --git a/web/app/assets/images/landing/us_latency_diagram.png b/web/app/assets/images/landing/us_latency_diagram.png new file mode 100644 index 000000000..6dddd6256 Binary files /dev/null and b/web/app/assets/images/landing/us_latency_diagram.png differ diff --git a/web/app/assets/images/web/button_cta_jamblaster.png b/web/app/assets/images/web/button_cta_jamblaster.png index aed1fab4a..932f2089e 100644 Binary files a/web/app/assets/images/web/button_cta_jamblaster.png and b/web/app/assets/images/web/button_cta_jamblaster.png differ diff --git a/web/app/assets/javascripts/jquery.trackEffects.js b/web/app/assets/javascripts/jquery.trackEffects.js index b0a15c74e..1fb34f8ea 100644 --- a/web/app/assets/javascripts/jquery.trackEffects.js +++ b/web/app/assets/javascripts/jquery.trackEffects.js @@ -65,9 +65,17 @@ timeout = null; } waitForBubbleHover($(container)) - timeout = setTimeout(function() {$parent.btOff()}, 3000) + timeout = setTimeout(function() {/**$parent.btOff()*/}, 3000) } }); + + $parent.hoverIntent({ + over: function() { + $parent.btOn(); + }, + out: function() { + + }}); }); } diff --git a/web/app/assets/javascripts/react-components.js b/web/app/assets/javascripts/react-components.js index cfc88f9ff..ee980b48e 100644 --- a/web/app/assets/javascripts/react-components.js +++ b/web/app/assets/javascripts/react-components.js @@ -3,6 +3,7 @@ //= require_directory ./react-components/helpers //= require_directory ./react-components/actions //= require ./react-components/stores/AppStore +//= require ./react-components/stores/PlatformStore //= require ./react-components/stores/BrowserMediaStore //= require ./react-components/stores/RecordingStore //= require ./react-components/stores/VideoStore @@ -17,7 +18,6 @@ //= require ./react-components/stores/SessionMyTracksStore //= require ./react-components/stores/SessionOtherTracksStore //= require ./react-components/stores/SessionMediaTracksStore -//= require ./react-components/stores/PlatformStore //= require ./react-components/stores/VideoUploaderStore //= require ./react-components/stores/JamTrackPlayerStore //= require_directory ./react-components/stores diff --git a/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee b/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee index a7a6ce34b..44436da27 100644 --- a/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee @@ -216,8 +216,11 @@ ConfigureTracksStore = @ConfigureTracksStore if isAudio activeElement = @renderAudio() + scanHelpRight = `Don't see your plug-in in the list above?` else activeElement = @renderMidi() + scanHelpLeft = `Don't see your plug-in in the list above?` + if !@state.configureTracks?.newTrack action = 'CLOSE' @@ -225,7 +228,6 @@ ConfigureTracksStore = @ConfigureTracksStore else cancelBtn = `CANCEL` - scanHelp = `Don't see your plug-in in the list above?` `
@@ -237,8 +239,10 @@ ConfigureTracksStore = @ConfigureTracksStore {activeElement}
+ {scanHelpLeft} {cancelBtn} {action} + {scanHelpRight}
` diff --git a/web/app/assets/javascripts/react-components/landing/ProductJamBlasterBottomPage.js.jsx.coffee b/web/app/assets/javascripts/react-components/landing/ProductJamBlasterBottomPage.js.jsx.coffee new file mode 100644 index 000000000..88bfb48b0 --- /dev/null +++ b/web/app/assets/javascripts/react-components/landing/ProductJamBlasterBottomPage.js.jsx.coffee @@ -0,0 +1,269 @@ +context = window + +@ProductJamBlasterBottomPage = React.createClass({ + + render: () -> + `
+ +
+
+

Play Music Live in Sync from Different Locations over the Internet

+ +

+ The ability to play live together from different locations enables many new possibilities including: +

+
    +
  • Rehearse without needing to pack gear, travel, and find rehearsal space
  • + +
  • Co-write new music interactively as if you're sitting in the same room rather than just sharing + files, which limits both creativity and speed +
  • +
  • Join open jam sessions any time to play live with others, make new connections, learn, and just have + fun playing more music +
  • +
+

+ Latency issues have historically prevented musicians from playing together over the Internet, but the + JamBlaster and JamKazam's patent pending software innovations have brought this dream to life. +

+ +

+ To demonstrate the kind of live distributed performances that are possible with the JamBlaster, we flew + the members of the band Big Cat to Austin TX, Atlanta GA, Chicago IL, and Brooklyn NY, and had them play + together using a JamBlaster at each location. They played from the homes of friends in those cities + using normal consumer Internet connections. We used a headphone splitter to record the audio that + Malford (singer) heard in real-time while singing, so you can hear exactly what he heard while + performing. Watch the video below to see and hear it! +

+ +
+
+