Merge branch 'integration' into feature/131269129/live-transcoding

voicerepublic · Mar 6, 2017 · 46348d2 · 46348d2
2 parents 520cf90 + 6dfcba5
commit 46348d2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/views/pages/publish_talk.html.haml b/app/views/pages/publish_talk.html.haml
@@ -21,7 +21,7 @@
       %li
         = link_to new_talk_path, class: 'big-button' do
           = naked_icon "clock"
-          schedule live talk
+          schedule live stream
         %p.publish-advice
           = t('.advice_live').html_safe
       %li
@@ -48,13 +48,13 @@
       %li
         = link_to new_talk_path, class: 'big-button' do
           = naked_icon "clock"
-          schedule live talk
+          schedule live stream
         %p.publish-advice
           = t('.advice_live').html_safe
       %li
         = link_to new_talk_path(talk: {dryrun: true}), class: 'big-button' do
           = naked_icon "beaker"
-          test a talk
+          test live stream
         %p.publish-advice
           = t('.advice_test').html_safe
 

diff --git a/lib/vrng/src/vrng/sporktrum.cljs b/lib/vrng/src/vrng/sporktrum.cljs
@@ -24,7 +24,7 @@
 
 ;; --- STATE & HELPERS
 
-(defonce audio (atom {:volume 10}))
+(defonce audio (atom {:volume 0}))
 
 (swap! audio assoc :browser (.browser js/window))
 

diff --git a/lib/vrng/src/vrng/venues/core.cljs b/lib/vrng/src/vrng/venues/core.cljs
@@ -188,6 +188,7 @@
    (filter #(= (venue-device-id) (:id %))
            (user-owned-devices))))
 
+;; TODO use correct name, noop is not
 (defn device-display-name []
   (or (venue-device-name)
       (:name (selected-device))))
@@ -631,7 +632,7 @@
     (device-display-name)]
    [:button#device-button.tiny.button.btn-white.btn-hover-green
     {:on-click toggle-source-wizard-action}
-    "change streaming source"]])
+    "choose streaming source"]])
 
 (defn talk-item-comp [talk]
   ^{:key (:id talk)}
@@ -667,7 +668,7 @@
       [:span.float-right.time-info (format-countdown (time-to-next-talk))]]
      ;;)
      [:div#next
-      [:a {:href (new-talk-path)} "+ Create a Talk"]])
+      [:a {:href (new-talk-path)} "+ Schedule Live Stream"]])
 
    ;;dropdown
    [:div#list-toggle