Skip to content

Commit

Permalink
Added mute and info (#5)
Browse files Browse the repository at this point in the history
Added mute and info
  • Loading branch information
theonlyfoxy authored and Aveek-Saha committed Nov 24, 2018
1 parent 190476b commit 6a21315
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 8 deletions.
16 changes: 14 additions & 2 deletions app/player/player.html
Expand Up @@ -46,9 +46,10 @@ <h3 id="artist"> {{trackArtist}} </h3><br>
<div class="slidecontainer justify-content-start">
<i class="fas fa-volume-down"></i>
<i class="fas fa-volume-up" style="float: right"></i>
<input type="range" min="0" max="100" value="100" class="slider" id="myRange">
<input type="range" min="0" max="100" value="100" class="slider" ng-model="!mute" id="myRange">
</div>


<button type="button" id="playlistBtn" class="btn btn-primary-outline btn-lg justify-content-end" ng-click="showPlaylist()">
<!-- <i class="fas fa-list fa-lg fa-inverse"></i> -->
<i class="fas fa-bars fa-lg fa-inverse"></i>
Expand All @@ -64,6 +65,17 @@ <h3 id="artist"> {{trackArtist}} </h3><br>
<i class="fas fa-sync-alt fa-lg fa-inverse"></i>
</button>


<button type="button" id="checkboxrn" ng-show="mute" class="btn btn-primary-outline btn-lg justify-content-end"
ng-click="togglecheckbox()">
<i class="fas fa-volume-off fa-lg fa-inverse"></i>
</button>

<button type="button" id="checkboxrn" ng-show="!mute" class="btn btn-primary-outline btn-lg justify-content-end"
ng-click="togglecheckbox()">
<i class="fas fa-volume-up fa-lg fa-inverse"></i>
</button>


</div>

Expand All @@ -76,4 +88,4 @@ <h3 id="artist"> {{trackArtist}} </h3><br>
<div class="list-song" ng-repeat="song in player.playlist" ng-click="playPlaylistSong($index)">{{song.name}}</div>
</div>
</div> -->
</div>
</div>
18 changes: 16 additions & 2 deletions app/player/player.js
Expand Up @@ -12,10 +12,12 @@ angular.module('Player.player', ['ngRoute', 'angular-siri-wave'])
$scope.songPlaying = false;
$scope.playListVisible = false;
$scope.shuffle = false;
$scope.mute = false;
// $scope.playMusic();

var slider = document.getElementById("myRange");
var sk = document.getElementById('seek')
var sk = document.getElementById('seek');
var checkbox = document.getElementById("checkboxrn")

const ipc = require('electron').ipcRenderer;
const jsmediatags = require("jsmediatags");
Expand Down Expand Up @@ -178,9 +180,21 @@ angular.module('Player.player', ['ngRoute', 'angular-siri-wave'])
}
}

$scope.togglecheckbox = function() {
if ($scope.mute) {
$scope.mute = false;
$scope.player.volume(slider.value / 100);
}
else {
$scope.mute = true;
$scope.player.volume(0);
}
}

slider.oninput = function () {
var val = slider.value / 100;
$scope.player.volume(val)
$scope.player.volume(val);
$scope.mute = false;
}

var Player = function (playlist) {
Expand Down
4 changes: 4 additions & 0 deletions app/style/style.css
Expand Up @@ -63,6 +63,10 @@ body{
float: right;
margin-right:5%
}
#checkboxrn{
float: right;
margin-right:5%
}
.slidecontainer {
/* display: inline-block; */
float: left;
Expand Down
11 changes: 8 additions & 3 deletions main.js
@@ -1,15 +1,17 @@
const { app, BrowserWindow, dialog, Menu } = require('electron')
const path = require('path')
const url = require('url')
const join = require('path').join;

const fs = require('fs')
const openAboutWindow = require('about-window').default;

let win

function createWindow() {
// Create the browser window.
win = new BrowserWindow({ width: 1000,
height: 620,
height: 620,
icon: __dirname + '/dusk.png' })

var menu = Menu.buildFromTemplate([
Expand All @@ -21,7 +23,10 @@ function createWindow() {
}
},
{
label: 'Info'
label: 'Info',
click: function () {
openAboutWindow({ product_name: "Dusk Player", copyright: "By Aveek Saha", icon_path: join(__dirname, 'build/icon.png'),})
}
}
])
Menu.setApplicationMenu(menu)
Expand Down Expand Up @@ -104,4 +109,4 @@ function scanDir(filePath) {
// console.log(win.webContents);

})
}
}
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -53,6 +53,7 @@
"jquery": "^3.3.1",
"jsmediatags": "^3.8.1",
"path": "^0.12.7",
"popper.js": "^1.14.1"
"popper.js": "^1.14.1",
"about-window": "1.12.1"
}
}

0 comments on commit 6a21315

Please sign in to comment.