Skip to content

Commit

Permalink
Merge pull request #12 from sallar/chores-and-fixes
Browse files Browse the repository at this point in the history
Update dependencies, fix minor issues
  • Loading branch information
sallar authored Jul 6, 2019
2 parents e01d230 + d340555 commit 381fad0
Show file tree
Hide file tree
Showing 5 changed files with 909 additions and 666 deletions.
2 changes: 1 addition & 1 deletion assets/streams.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ul>
<li><strong>Name:</strong> <code><%= stream.publisher.stream %></code> (<%= stream.subscribers.length %> clients connected)</li>
<li><strong>Traffic:</strong> <%= tools.filesize(stream.publisher.bytes) %></li>
<li><strong>Audio:</strong> <%= stream.publisher.audio.codec %> <%= stream.publisher.audio.samplerate / 1000 %>khz, <%= stream.publisher.audio.channels %> channels</li>
<li><strong>Audio:</strong> <% if (stream.publisher.audio) { %><%= stream.publisher.audio.codec %> <%= stream.publisher.audio.samplerate / 1000 %>khz, <%= stream.publisher.audio.channels %> channels<% } else { %>None<% } %></li>
<li><strong>Video:</strong> <%= stream.publisher.video.codec %> <%= [stream.publisher.video.width, stream.publisher.video.height].join('x') %> <%= stream.publisher.video.fps %>fps</li>
<li><strong>URL:</strong>
<div class="copyable no-title">
Expand Down
14 changes: 10 additions & 4 deletions main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const NodeMediaServer = require('node-media-server');
const getPort = require('get-port');
const electron = require('electron');
const Menubar = require('menubar');
const path = require('path');
const { menubar: Menubar } = require('menubar');

require('electron-context-menu')();

Expand All @@ -26,7 +26,13 @@ const menubar = Menubar({
icon: path.resolve(ASSET_PATH, 'img/readyTemplate.png'),
height: 200,
transparent: true,
preloadWindow: true
preloadWindow: true,
browserWindow: {
height: 200,
webPreferences: {
nodeIntegration: true
}
}
});

(async () => {
Expand Down Expand Up @@ -80,7 +86,7 @@ const menubar = Menubar({
event.sender.send('port-ready', port);
});

ipcMain.on('error', event =>
console.error(event)
ipcMain.on('error', event => {
console.error(event);
});
})();
Loading

0 comments on commit 381fad0

Please sign in to comment.