djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jb-alvarado/ffplayout-gui

Browse Source
This commit is contained in:
Jonathan Baecker 2019-08-15 13:53:44 +02:00
commit f8c0eb1225
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
ffplayout-gui ffplayout-gui
===== =====
Web-based graphical user interface for [ffplayout](https://github.com/jb-alvarado/ffplayout). Web-based graphical user interface for [ffplayout-engine](https://github.com/ffplayout/ffplayout-engine).
![ffplayout-gui](./ffplayout-gui.png) ![ffplayout-gui](./ffplayout-gui.png)

1
resources/js/custom.js
View File

@ -359,7 +359,6 @@ $('#bt_sys').click(function() {
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
header functions header functions
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
var intervalId = null;
function get_track_list(interval) { function get_track_list(interval) {
var begin, seek, out, time_left; var begin, seek, out, time_left;