Improve STPP support for video playback

ecv80 · Mar 17, 2016 · 4d32d2c · 4d32d2c
1 parent 4eb1cf2
commit 4d32d2c
Show file tree

Hide file tree

Showing 7 changed files with 392 additions and 19 deletions.
diff --git a/glwskins/flat/osd/osd_audio.view b/glwskins/flat/osd/osd_audio.view
@@ -3,9 +3,9 @@
 
 widget(container_y, {
  id: "osd_audio";
-#import "skin:https://styles/style_sidebar.view"
 
  widget(label, {
+ style: "osdsettingtitle";
  height: 3em;
  align: center;
  caption: _("Audio");

diff --git a/glwskins/flat/osd/osd_main.view b/glwskins/flat/osd/osd_main.view
@@ -6,7 +6,6 @@ widget(container_y, {
  width: 22em;
  id: "osd_main";
  padding: [0,3em, 0, 0];
-#import "skin:https://styles/style_sidebar.view"
 
  widget(list_y, {
 

diff --git a/glwskins/flat/osd/osd_settings.view b/glwskins/flat/osd/osd_settings.view
@@ -4,10 +4,10 @@
 
 
  widget(container_y, {
-#import "skin:https://styles/style_sidebar.view"
  id: ID;
 
  widget(label, {
+ style: "osdsettingtitle";
  height: 3em;
  align: center;
  caption: TITLE;

diff --git a/glwskins/flat/osd/osd_subs.view b/glwskins/flat/osd/osd_subs.view
@@ -3,9 +3,9 @@
 
 widget(container_y, {
  id: "osd_subs";
-#import "skin:https://styles/style_sidebar.view"
 
  widget(label, {
+ style: "osdsettingtitle";
  height: 3em;
  align: center;
  caption: _("Subtitles");

diff --git a/glwskins/flat/pages/stpp.view b/glwskins/flat/pages/stpp.view
@@ -43,29 +43,69 @@ coreAttach($self.url, $view.stppstatus, {
  });
  });
 
- widget(layer, {
+ widget(container_z, {
  hidden: select($view.stppstatus.error, true, false);
  filterConstraintY: true;
- alpha: iir(1 - $ui.screensaverActive, 8);
- widget(playfield, {
- effect: blend;
- noInitialTransform: true;
- alpha: 1 - iir(clamp(getLayer(), 0, 1), 7) * 0.66;
+ widget(layer, {
+ alpha: iir(1 - $ui.screensaverActive, 8);
+ widget(playfield, {
+ effect: blend;
+ noInitialTransform: true;
+ alpha: 1 - iir(clamp(getLayer(), 0, 1), 7) * 0.66;
 
- onEvent(navOpen, deliverEvent($core.navigators.current.eventSink));
- onEvent(reloadData, deliverEvent($core.navigators.current.eventSink));
- onEvent(back, deliverEvent($core.navigators.current.eventSink));
- onEvent(playTrackFromSource, deliverEvent($core.playqueue.eventSink));
+  onEvent(navOpen, deliverEvent($core.navigators.current.eventSink));
+  onEvent(reloadData, deliverEvent($core.navigators.current.eventSink));
+  onEvent(back, deliverEvent($core.navigators.current.eventSink));
+  onEvent(playTrackFromSource, deliverEvent($core.playqueue.eventSink));
 
- cloner($core.navigators.current.pages, container_z, {
+ cloner($core.navigators.current.pages, container_z, {
+
+ widget(loader, {
+ noInitialTransform: true;
+ source: translate($self.model.type,
+ select(isVoid($self.model.type),
+ "skin:https://pages/back.view",
+ "skin:https://pages/" + $self.model.type + ".view"),
+ "video", "skin:https://pages/stppvideo.view");
+ });
+ });
+ });
+ });
+
+ widget(container_y, {
+ space(1);
+ widget(container_y, {
+ delta($ui.universeBottomHeight, getHeight());
+
+ expediteSubscriptions: true;
+
+ style(playdeckText, {
+ font: "skin:https://fonts/RobotoCondensed-Regular.ttf";
+ });
 
  widget(loader, {
- noInitialTransform: true;
- source: select(isVoid($self.model.type),
- "skin:https://pages/back.view",
- "skin:https://pages/" + $self.model.type + ".view");
+ autohide: true;
+ source: translate($core.media.current.type, "",
+ "tracks", "skin:https://playdecks/" + $ui.orientation + "/tracks.view",
+ "radio", "skin:https://playdecks/" + $ui.orientation + "/radio.view"
+ );
+ });
+
+ cloner($core.notifications.nodes, container_z, {
+ widget(quad, {
+ color: 0;
+ alpha: 0.2;
+ });
+
+ widget(label, {
+ padding: [2em, 0.5em];
+ caption: $self.text;
+ });
  });
 
+ widget(dummy, {
+ height: 0;
+ });
  });
  });
  });