Macaw/radio
3
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

WIP Merging basic player to master #6

Merged
blue merged 17 commits from player into master 2019-02-01 22:32:52 +00:00
Conversation 0 Commits 17 Files Changed 91 +35 -11
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 43d0a1dfe9 - Show all commits

4
corax/models/proxysong.cpp
View File

@ -15,7 +15,7 @@ ProxySong::ProxySong(const W::Uint64& p_id, const W::Address& p_address, QObject
insert(W::String(u"id"), p_id);
insert(W::String(u"artist"), new W::String(u"undefined"));
insert(W::String(u"album"), new W::String(u"undefined"));
insert(W::String(u"name"), new W::String(u"undefined"));
insert(W::String(u"song"), new W::String(u"undefined"));
insert(W::String(u"image"), new W::Uint64(0));
}
@ -31,7 +31,7 @@ ProxySong::~ProxySong()
void ProxySong::onSongNewElement(const W::String& key, const W::Object& element)
{
if (key == u"name") {
insert(key, element);
insert(W::String(u"song"), element);
} else if (key == u"audio") {
if (_ready) {
_ready = false;

17
libjs/wController/imagePane.js
View File

@ -36,10 +36,10 @@ var ImagePane = Vocabulary.inherit({
this.trigger("seviceMessage", "Action " + act + " is not supported in ImagePanel, skipping");
supported = false;
}
var model = new LM("");
var model = new LM(actionProps, "");
model.enabled = true;
model.hasLabel = true;
model.label = new LM(actObj.name);
model.label = new LM(actionLabelProps, actObj.name);
model.addController(model.label);
model.activate = this._actionActivate.bind(this, act);
@ -111,10 +111,21 @@ var ImagePane = Vocabulary.inherit({
var standardActions = {
"play": {
handler: function (obj) {
window.play(obj);
var id = obj._pairAddress.back(); //todo it's a kind of crutch, need to do something about it in the future
window.play(id);
id.destructor();
},
name: "Play"
}
};
var actionProps = {
"backgroundColor": "primaryColor"
};
var actionLabelProps = {
"fontFamily": "casualFont",
"fontSize": "casualFontSize",
"color": "primaryFontColor"
}
module.exports = ImagePane;

14
lorgar/core/lorgar.js
View File

@ -232,7 +232,17 @@
this._body.setSize(document.body.offsetWidth, document.body.offsetHeight);
},
"play": function(id) {
console.log("Need to play " + id.toString());
if (this._nodes.Corax && this._nodes.Corax.connected) {
var vc = new Vocabulary();
vc.insert("id", id.clone());
var ev = new Event(this._playerCtl.getPairAddress()["+="](queue), vc);
var socket = this._nodes.Corax.socket;
ev.setSenderId(socket.getId().clone());
socket.send(ev);
ev.destructor();
}
},
"_prepareNode": function(name, address, port) {
if (this._nodes[name]) {
@ -338,6 +348,8 @@
SocketState.add("connecting", {description: "Socket is connecting to remote host"});
SocketState.add("connected", {description: "Socket is connected"});
var queue = new Address(["queue"]);
return Lorgar;
});
})();

3
lorgar/views/button.js
View File

@ -48,10 +48,11 @@
Layout.fn._onChildChangeLimits.call(this, child);
},
"_onClick": function() {
"_onClick": function(e) {
if (this._enabled) {
this._f.activate();
}
e.stopPropagation();
},
"_onSetEnabled": function(enabled) {
if (this._enabled !== enabled) {

8
lorgar/views/player.js
View File

@ -42,10 +42,10 @@
var song = new Label(this._infoModels.song);
var spacer = new View(helper);
this.append(artist, 0, 2, 1, 1)
this.append(song, 1, 2, 1, 1)
this.append(album, 2, 2, 1, 1)
this.append(spacer, 0, 3, 3, 1);
this.append(artist, 0, 2, 1, 1, GridLayout.Aligment.LeftCenter);
this.append(song, 1, 2, 1, 1, GridLayout.Aligment.LeftCenter);
this.append(album, 2, 2, 1, 1, GridLayout.Aligment.LeftCenter);
this.append(spacer, 0, 3, 3, 1, GridLayout.Aligment.LeftCenter);
this._uncyclic.push(this._infoModels.artist.destructor.bind(this._infoModels.artist));
this._uncyclic.push(this._infoModels.song.destructor.bind(this._infoModels.song));