Skip to content

Gamma/Brightness filter #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
accraze wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Gamma/Brightness filter #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8586b81
added brightness filter and settings popup
accraze Dec 13, 2015
4bc62d6
fixed styling for settings control
accraze Dec 13, 2015
5b0b198
remove debug menu
accraze Dec 13, 2015
43d375b
resized brightness label
accraze Dec 17, 2015
cc26032
added correct slider style to brightness filter
accraze Dec 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 75 additions & 2 deletions index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ body, html {
background-size: 100%;
background-position: -50%;
background-repeat: no-repeat;
-webkit-filter: grayscale(100%);
/*-webkit-filter: grayscale(100%);*/
/*-webkit-filter: blur(13px);*/
}

#overlay {
Expand Down Expand Up @@ -77,6 +78,10 @@ body, html {
display: none;
}

#popup.chromecast #settings-popup {
display: none;
}

#popup.playlist #playlist-popup {
display: block;
}
Expand All @@ -85,6 +90,22 @@ body, html {
display: none;
}

#popup.playlist #settings-popup {
display: none;
}

#popup.settings #settings-popup {
display: block;
}

#popup.settings #chromecast-popup {
display: none;
}

#popup.settings #playlist-popup {
display: none;
}

#playlist-entries, #chromecast-entries {
position: absolute;
top: 46px;
Expand All @@ -103,6 +124,15 @@ body, html {
white-space: nowrap;
}

/*.brightness {
color: #fff;
font-size: 13px;
padding: 10px 15px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}*/

@-webkit-keyframes spin {
to { -webkit-transform: rotate(360deg); }
}
Expand Down Expand Up @@ -277,10 +307,11 @@ body:hover #overlay, body:hover .titlebar {

#controls-play span:hover .mega-octicon, #player-downloadspeed span:hover .mega-octicon,
#controls-fullscreen span:hover .mega-octicon, #controls-playlist span:hover .mega-octicon,
#controls-chromecast span:hover .mega-octicon {
#controls-chromecast span:hover .mega-octicon, #controls-settings span:hover .mega-octicon {
color: #31A357;
}


#controls-chromecast .chromecast {
background-image: url('chromecast.png');
background-size: 26px 72px;
Expand Down Expand Up @@ -368,3 +399,45 @@ body:hover #overlay, body:hover .titlebar {
float: left;
margin-left: 20px;
}


#controls-settings {
float: right;
margin-right: 10px;
margin-top: 10px !important;
}

.brightness {
margin-top: 20px;
margin-left: 10px;

}

#controls-brightness-slider {
-webkit-appearance: none;
background: #727374;
width: 50px;
height: 4px;
border-radius: 0px;
float: right;
margin-top: 12px;
margin-left: 5px;
}

#controls-brightness-slider::-webkit-slider-thumb {
-webkit-appearance: none;
background-color: #31A357;
opacity: 1.0;
width: 9px;
height: 9px;
border-radius: 4.5px;
}

#controls-brightness-slider:focus {
outline: none;
}

#settings-popup span label {
font-size: 15px;
}

11 changes: 11 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@
<div class="header">Chromecasts</div>
<div id="chromecast-entries"></div>
</div>
<div id="settings-popup">
<div class="header">Settings</div>
<span class="brightness mega-octicon octicon-light-bulb">
<label>Brightness</label>
<input id="controls-brightness-slider"
type="range" oninput="set('brightness', this.valueAsNumber);"
value="0" step="0.1" min="0" max="10"></span>
</div>
</div>
<div id="titlebar"></div>
<div id="idle"></div>
Expand All @@ -42,6 +50,9 @@
<span id="controls-time-total">‒‒:‒‒</span>
</div>
<div id="controls-name" class="center"></div>
<div id="controls-settings" class="center">
<span class="button"><span class="mega-octicon octicon-gear"></span></span>
</div>
</div>
<div class="right controls-secondary">
<div id="player-downloadspeed"></div>
Expand Down
63 changes: 61 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,27 @@ var argv = minimist(JSON.parse(window.location.toString().split('#')[1]), {
boolean: ['follow']
})


var FILTER_VALS = {};
var el = document.querySelector('video');

var set = function (filter, value) {
FILTER_VALS[filter] = typeof value == 'number' ? Math.round(value * 10) / 10 : value;
if (value == 0 || (typeof value == 'string' && value.indexOf('0') == 0)) {
delete FILTER_VALS[filter];
}
render();
}

var render = function () {
var vals = [];
Object.keys(FILTER_VALS).sort().forEach(function(key, i) {
vals.push(key + '(' + FILTER_VALS[key] + ')');
});
var val = vals.join(' ');
el.style.webkitFilter = val;
}

var printError = function (err) {
if (err) console.log(err)
}
Expand Down Expand Up @@ -190,6 +211,7 @@ $('#controls-timeline').on('mouseout', function (e) {
})

var isVolumeSliderClicked = false
var isBrightnessSliderClicked = false

function updateAudioVolume(value) {
media.volume(value)
Expand Down Expand Up @@ -219,6 +241,28 @@ $('#controls-volume-slider').on('mouseup', function (e) {
isVolumeSliderClicked = false
})

function updateBrightnessSlider(brightness) {
var val = brightness.value * 10;
brightness.style.background = '-webkit-gradient(linear, left top, right top, color-stop(' + val.toString() + '%, #31A357), color-stop(' + val.toString() + '%, #727374))'
}

$('#controls-brightness-slider').on('mousemove', function (e) {
if (isBrightnessSliderClicked) {
var brightness = $('#controls-brightness-slider')[0]
updateBrightnessSlider(brightness)
}
})

$('#controls-brightness-slider').on('mousedown', function (e) {
isBrightnessSliderClicked = true
})

$('#controls-brightness-slider').on('mouseup', function (e) {
var brightness = $('#controls-brightness-slider')[0]
updateBrightnessSlider(brightness)
isBrightnessSliderClicked = false
})

$(document).on('keydown', function (e) {
if (e.keyCode === 27 && isFullscreen) return onfullscreentoggle(e)
if (e.keyCode === 13 && e.metaKey) return onfullscreentoggle(e)
Expand All @@ -227,6 +271,7 @@ $(document).on('keydown', function (e) {

if ($('#controls-playlist').hasClass('selected')) $('#controls-playlist').trigger('click')
if ($('#controls-chromecast').hasClass('selected')) $('#controls-chromecast').trigger('click')
if ($('#controls-settings').hasClass('selected')) $('#controls-settings').trigger('click')
})

mouseidle($('#idle')[0], 3000, 'hide-cursor')
Expand Down Expand Up @@ -285,14 +330,15 @@ list.once('update', function () {
})

var popupSelected = function () {
return $('#controls-playlist').hasClass('selected') || $('#controls-chromecast').hasClass('selected')
return $('#controls-playlist').hasClass('selected') || $('#controls-chromecast').hasClass('selected') || $('#controls-settings').hasClass('selected')
}

var closePopup = function (e) {
if (e && (e.target === $('#controls-playlist .mega-octicon')[0] || e.target === $('#controls-chromecast .chromecast')[0])) return
if (e && (e.target === $('#controls-playlist .mega-octicon')[0] || e.target === $('#controls-chromecast .chromecast')[0] || e.target === $('#controls-settings .mega-octicon')[0])) return
$('#popup')[0].style.opacity = 0
$('#controls-playlist').removeClass('selected')
$('#controls-chromecast').removeClass('selected')
$('#controls-settings').removeClass('selected')
}

$('#controls').on('click', closePopup)
Expand Down Expand Up @@ -327,6 +373,19 @@ var updatePopup = function () {
}
}

$('#controls-settings').on('click', function (e) {
if ($('#controls-settings').hasClass('selected')) {
closePopup()
return
}

$('#popup')[0].className = 'settings'
$('#controls .controls-main .selected').removeClass('selected')
$('#controls-settings').addClass('selected')
chromecasts.update()
updatePopup()
})

$('#controls-chromecast').on('click', function (e) {
if ($('#controls-chromecast').hasClass('selected')) {
closePopup()
Expand Down