Skip to content

Commit

Permalink
Revert 30b863b. See #310
Browse files Browse the repository at this point in the history
  • Loading branch information
bastimeyer committed Sep 14, 2016
1 parent 8c45229 commit 90c3dbf
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion src/app/models/LivestreamerParameters.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const parameters = [
),
new Parameter(
"--twitch-oauth-token",
[ "session.isLoggedIn", "settings.livestreamer_oauth" ],
"session.isLoggedIn",
"session.access_token"
),
new Parameter(
Expand Down
1 change: 0 additions & 1 deletion src/app/models/localstorage/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export default Model.extend({
advanced : attr( "boolean", { defaultValue: false } ),
livestreamer : attr( "string", { defaultValue: "" } ),
livestreamer_params : attr( "string", { defaultValue: "" } ),
livestreamer_oauth : attr( "boolean", { defaultValue: true } ),
quality : attr( "number", { defaultValue: 0 } ),
player : attr( "string", { defaultValue: "" } ),
player_params : attr( "string", { defaultValue: "" } ),
Expand Down
9 changes: 0 additions & 9 deletions src/templates/settings/SettingsLivestreamer.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@
{{/unless}}
{{/if}}

{{#settings-row
"Twitch.tv login"
"Allow Livestreamer to use the Twitch.tv oauth token while being logged in."
icon="fa-sign-in"
documentation="--twitch-oauth-token"
}}
{{check-box "Authenticate when launching a stream" checked=model.livestreamer_oauth}}
{{/settings-row}}

{{#settings-row
"Launch attempts"
"Number of stream launch attempts."
Expand Down

0 comments on commit 90c3dbf

Please sign in to comment.