diff -Nru audience-0.2.4+r776/CMakeLists.txt audience-0.2.4+r778/CMakeLists.txt
--- audience-0.2.4+r776/CMakeLists.txt 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/CMakeLists.txt 2017-08-14 12:31:38.000000000 +0000
@@ -4,7 +4,7 @@
enable_testing ()
list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-project (audience C)
+project (io.elementary.videos C)
set (DATADIR ${CMAKE_INSTALL_PREFIX}/share)
set (PKGDATADIR ${DATADIR}/${CMAKE_PROJECT_NAME})
diff -Nru audience-0.2.4+r776/data/CMakeLists.txt audience-0.2.4+r778/data/CMakeLists.txt
--- audience-0.2.4+r776/data/CMakeLists.txt 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/data/CMakeLists.txt 2017-08-14 12:31:38.000000000 +0000
@@ -14,10 +14,10 @@
configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/audience-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop ${CMAKE_SOURCE_DIR}/po/)
endif ()
-configure_file_translation (org.pantheon.audience.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation (io.elementary.videos.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.videos.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop DESTINATION ${DATADIR}/applications/)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.appdata.xml DESTINATION ${DATADIR}/appdata/)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.videos.appdata.xml DESTINATION ${DATADIR}/appdata/)
include (GSettings)
diff -Nru audience-0.2.4+r776/data/io.elementary.videos.appdata.xml.in audience-0.2.4+r778/data/io.elementary.videos.appdata.xml.in
--- audience-0.2.4+r776/data/io.elementary.videos.appdata.xml.in 1970-01-01 00:00:00.000000000 +0000
+++ audience-0.2.4+r778/data/io.elementary.videos.appdata.xml.in 2017-08-14 12:31:38.000000000 +0000
@@ -0,0 +1,93 @@
+
+
+
+ org.pantheon.audience.desktop
+ CC0-1.0
+ elementary
+ GPL-3.0+
+ <_name>Videos
+ <_summary>Watch videos and movies
+
+ <_p>
+ A modern video player that focuses on displaying video content instead of
+ player controls. It remembers your last played video and playback position
+ so you can pick up from where you left off.
+
+ <_p>
+ Additional features include:
+
+
+ <_li>Subtitle support
+ <_li>Play queue
+ <_li>Thumbnail previews on the seek bar
+
+
+
+ io.elementary.videos
+
+
+
+
+
+ <_li>Limit consecutive spacebar pauses
+
+
+
+
+
+
+ <_li>Crash fixes
+ <_li>Remove About dialog
+ <_li>Minor bug fixes
+ <_li>Translation updates
+
+
+
+
+
+
+ <_li>Preview popover now closely follows cursor position
+ <_li>Translation updates
+
+
+
+
+
+
+ <_li>Translation updates
+
+
+
+
+
+
+ <_li>Fix appstream date format
+
+
+
+
+
+
+ <_li>Added a library view with search
+ <_li>Fixed a bug that prevents keyboard navigation
+ <_li>Translation updates
+
+
+
+
+
+
+
+
+
+ elementary LLC.
+ https://elementary.io/
+ https://github.com/elementary/videos/issues
+ https://elementary.io/get-involved#funding
+ https://elementaryos.stackexchange.com/questions/tagged/videos
+ https://l10n.elementary.io/projects/videos
+ contact_AT_elementary.io
+ #2b63a0
+
diff -Nru audience-0.2.4+r776/data/org.pantheon.audience.appdata.xml.in audience-0.2.4+r778/data/org.pantheon.audience.appdata.xml.in
--- audience-0.2.4+r776/data/org.pantheon.audience.appdata.xml.in 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/data/org.pantheon.audience.appdata.xml.in 1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-
-
-
- org.pantheon.audience.desktop
- CC0-1.0
- elementary
- GPL-3.0+
- <_name>Videos
- <_summary>Watch videos and movies
-
- <_p>
- A modern video player that focuses on displaying video content instead of
- player controls. It remembers your last played video and playback position
- so you can pick up from where you left off.
-
- <_p>
- Additional features include:
-
-
- <_li>Subtitle support
- <_li>Play queue
- <_li>Thumbnail previews on the seek bar
-
-
-
- audience
-
-
-
-
-
- <_li>Limit consecutive spacebar pauses
-
-
-
-
-
-
- <_li>Crash fixes
- <_li>Remove About dialog
- <_li>Minor bug fixes
- <_li>Translation updates
-
-
-
-
-
-
- <_li>Preview popover now closely follows cursor position
- <_li>Translation updates
-
-
-
-
-
-
- <_li>Translation updates
-
-
-
-
-
-
- <_li>Fix appstream date format
-
-
-
-
-
-
- <_li>Added a library view with search
- <_li>Fixed a bug that prevents keyboard navigation
- <_li>Translation updates
-
-
-
-
-
-
-
-
-
- elementary LLC.
- https://elementary.io/
- https://github.com/elementary/videos/issues
- https://elementary.io/get-involved#funding
- https://elementaryos.stackexchange.com/questions/tagged/videos
- https://l10n.elementary.io/projects/videos
- contact_AT_elementary.io
- #2b63a0
-
diff -Nru audience-0.2.4+r776/data/org.pantheon.audience.desktop.in.in audience-0.2.4+r778/data/org.pantheon.audience.desktop.in.in
--- audience-0.2.4+r776/data/org.pantheon.audience.desktop.in.in 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/data/org.pantheon.audience.desktop.in.in 2017-08-14 12:31:38.000000000 +0000
@@ -3,12 +3,12 @@
_Name=@APP_NAME@
_GenericName=Video Player
_Comment=Watch videos and movies
-Exec=audience %U
+Exec=io.elementary.videos %U
Icon=multimedia-video-player
StartupNotify=true
Terminal=false
Type=Application
Categories=AudioVideo;Video;Player;TV;
MimeType=application/x-musepack;application/musepack;application/x-ape;application/x-id3;application/ogg;application/x-ogg;application/x-vorbis+ogg;application/x-flac;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;application/vnd.rn-realmedia;video/vnd.rn-realvideo;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;application/x-drm-v2;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/3gpp;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;video/x-matroska;video/matroska;video/x-mng;video/webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg;
-X-GNOME-Gettext-Domain=audience
+X-GNOME-Gettext-Domain=io.elementary.videos
X-PulseAudio-Properties=media.role=video
diff -Nru audience-0.2.4+r776/debian/bzr-builder.manifest audience-0.2.4+r778/debian/bzr-builder.manifest
--- audience-0.2.4+r776/debian/bzr-builder.manifest 2017-08-13 12:33:02.000000000 +0000
+++ audience-0.2.4+r778/debian/bzr-builder.manifest 2017-08-14 12:31:41.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}+r776-0+pkg36~daily
-lp:audience revid:git-v1:c003cd6e0a2285e6f172cfdc53f3a95e603a0384
+# bzr-builder format 0.3 deb-version {debupstream}+r778-0+pkg36~daily
+lp:audience revid:git-v1:b19eab15c5499fcb899953a7a789c5b92a63ec17
nest-part packaging lp:~elementary-os/audience/deb-packaging debian debian revid:cody@elementary.io-20170812020847-1g1rx3tga1ynkkot
diff -Nru audience-0.2.4+r776/debian/changelog audience-0.2.4+r778/debian/changelog
--- audience-0.2.4+r776/debian/changelog 2017-08-13 12:33:02.000000000 +0000
+++ audience-0.2.4+r778/debian/changelog 2017-08-14 12:31:41.000000000 +0000
@@ -1,8 +1,8 @@
-audience (0.2.4+r776-0+pkg36~daily~ubuntu0.4.1.1) xenial; urgency=low
+audience (0.2.4+r778-0+pkg36~daily~ubuntu0.4.1.1) xenial; urgency=low
* Auto build.
- -- Launchpad Package Builder Sun, 13 Aug 2017 12:33:02 +0000
+ -- Launchpad Package Builder Mon, 14 Aug 2017 12:31:41 +0000
audience (0.2.4) xenial; urgency=medium
diff -Nru audience-0.2.4+r776/po/CMakeLists.txt audience-0.2.4+r778/po/CMakeLists.txt
--- audience-0.2.4+r776/po/CMakeLists.txt 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/po/CMakeLists.txt 2017-08-14 12:31:38.000000000 +0000
@@ -7,5 +7,5 @@
${CMAKE_BINARY_DIR}/data/org.pantheon.audience.desktop.in
${CMAKE_BINARY_DIR}/data/audience-original.desktop.in
APPDATA_FILES
- ../data/org.pantheon.audience.appdata.xml.in
+ ../data/io.elementary.videos.appdata.xml.in
)
diff -Nru audience-0.2.4+r776/README.md audience-0.2.4+r778/README.md
--- audience-0.2.4+r776/README.md 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/README.md 2017-08-14 12:31:38.000000000 +0000
@@ -23,7 +23,7 @@
cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make
-To install, use `make install`, then execute with `audience`
+To install, use `make install`, then execute with `io.elementary.videos`
sudo make install
- audience
+ io.elementary.videos
diff -Nru audience-0.2.4+r776/src/Audience.vala audience-0.2.4+r778/src/Audience.vala
--- audience-0.2.4+r776/src/Audience.vala 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/src/Audience.vala 2017-08-14 12:31:38.000000000 +0000
@@ -40,7 +40,7 @@
construct {
program_name = _(Constants.APP_NAME);
- exec_name = "audience";
+ exec_name = "io.elementary.videos";
build_data_dir = Constants.DATADIR;
build_pkg_data_dir = Constants.PKGDATADIR;
@@ -52,7 +52,7 @@
app_icon = "multimedia-video-player";
app_launcher = "org.pantheon.audience.desktop";
- application_id = "org.pantheon.audience";
+ application_id = "io.elementary.videos";
}
public App () {
diff -Nru audience-0.2.4+r776/src/Widgets/Player/BottomBar.vala audience-0.2.4+r778/src/Widgets/Player/BottomBar.vala
--- audience-0.2.4+r776/src/Widgets/Player/BottomBar.vala 2017-08-13 12:33:00.000000000 +0000
+++ audience-0.2.4+r778/src/Widgets/Player/BottomBar.vala 2017-08-14 12:31:38.000000000 +0000
@@ -27,9 +27,6 @@
public signal void unfullscreen ();
public signal void seeked (double val);
- public bool playing { get; set; default=false; }
- public bool hovered { get; set; default=false; }
- public bool fullscreen { get; set; default=false; }
public SettingsPopover preferences_popover;
public PlaylistPopover playlist_popover;
public TimeWidget time_widget;
@@ -41,6 +38,58 @@
private uint hiding_timer = 0;
private bool playlist_glowing = false;
+ private bool _fullscreen = false;
+ public bool fullscreen {
+ get {
+ return _fullscreen;
+ }
+ set {
+ _fullscreen = value;
+ if (value && child_revealed) {
+ unfullscreen_revealer.reveal_child = true;
+ } else if (!value && child_revealed) {
+ unfullscreen_revealer.reveal_child = false;
+ }
+ }
+ }
+
+ private bool _hovered = false;
+ private bool hovered {
+ get {
+ return _hovered;
+ }
+ set {
+ _hovered = value;
+ if (value) {
+ if (hiding_timer != 0) {
+ Source.remove (hiding_timer);
+ hiding_timer = 0;
+ }
+ } else {
+ reveal_control ();
+ }
+ }
+ }
+
+ private bool _playing = false;
+ public bool playing {
+ get {
+ return _playing;
+ }
+ set {
+ _playing = value;
+ if (value) {
+ ((Gtk.Image) play_button.image).icon_name = "media-playback-pause-symbolic";
+ play_button.tooltip_text = _("Pause");
+ reveal_control ();
+ } else {
+ ((Gtk.Image) play_button.image).icon_name = "media-playback-start-symbolic";
+ play_button.tooltip_text = _("Play");
+ set_reveal_child (true);
+ }
+ }
+ }
+
public bool repeat {
get {
return playlist_popover.rep.active;
@@ -55,8 +104,15 @@
this.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
this.events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
- this.enter_notify_event.connect ((event) => { this.hovered = true; return false; });
- this.leave_notify_event.connect ((event) => { this.hovered = false; return false; });
+ this.enter_notify_event.connect ((event) => {
+ this.hovered = true;
+ return false;
+ });
+
+ this.leave_notify_event.connect ((event) => {
+ this.hovered = false;
+ return false;
+ });
this.transition_type = Gtk.RevealerTransitionType.SLIDE_UP;
@@ -64,17 +120,23 @@
play_button = new Gtk.Button.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.BUTTON);
play_button.tooltip_text = _("Play");
- play_button.clicked.connect (() => {play_toggled ();});
+ play_button.clicked.connect (() => {
+ playing = !playing;
+ play_toggled ();
+ });
playlist_button = new Gtk.Button.from_icon_name ("view-list-symbolic", Gtk.IconSize.BUTTON);
playlist_button.tooltip_text = _("Playlist");
- playlist_button.clicked.connect (() => {playlist_popover.show_all (); playlist_popover.queue_resize ();});
+ playlist_button.clicked.connect (() => {
+ playlist_popover.show_all ();
+ playlist_popover.queue_resize ();
+ });
preferences_button = new Gtk.Button.from_icon_name ("open-menu-symbolic", Gtk.IconSize.BUTTON);
preferences_button.tooltip_text = _("Settings");
preferences_button.clicked.connect (() => {
preferences_popover.setup ();
- preferences_popover.show_all ();
+ preferences_popover.show_all ();
preferences_popover.queue_resize ();
});
@@ -95,40 +157,16 @@
playlist_item_added ();
});
- notify["hovered"].connect (() => {
- if (hovered == false) {
- reveal_control ();
- } else {
- if (hiding_timer != 0) {
- Source.remove (hiding_timer);
- hiding_timer = 0;
- }
- }
- });
-
- notify["fullscreen"].connect (() => {
- if (fullscreen == true && child_revealed == true) {
- unfullscreen_revealer.set_reveal_child (true);
- } else if (fullscreen == false && child_revealed == true) {
- unfullscreen_revealer.set_reveal_child (false);
- }
- });
-
- play_button.clicked.connect (() => {
- playing = !playing;
+ var unfullscreen_button = new Gtk.Button.from_icon_name ("view-restore-symbolic", Gtk.IconSize.BUTTON);
+ unfullscreen_button.tooltip_text = _("Unfullscreen");
+ unfullscreen_button.clicked.connect (() => {
+ unfullscreen ();
});
- notify["playing"].connect (() => {
- if (playing == true) {
- ((Gtk.Image) play_button.image).icon_name = "media-playback-pause-symbolic";
- play_button.tooltip_text = _("Pause");
- reveal_control ();
- } else {
- ((Gtk.Image) play_button.image).icon_name = "media-playback-start-symbolic";
- play_button.tooltip_text = _("Play");
- set_reveal_child (true);
- }
- });
+ unfullscreen_revealer = new Gtk.Revealer ();
+ unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+ unfullscreen_revealer.add (unfullscreen_button);
+ unfullscreen_revealer.show_all ();
show_all ();
}
@@ -138,7 +176,7 @@
playlist_glowing = true;
playlist_button.get_child ().get_style_context ().add_class (PULSE_CLASS);
playlist_button.get_child ().get_style_context ().add_class (PULSE_TYPE);
-
+
Timeout.add (6000, () => {
playlist_button.get_child ().get_style_context ().remove_class (PULSE_CLASS);
playlist_button.get_child ().get_style_context ().remove_class (PULSE_TYPE);
@@ -149,30 +187,23 @@
}
public Gtk.Revealer get_unfullscreen_button () {
- unfullscreen_revealer = new Gtk.Revealer ();
- unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
-
- var unfullscreen_button = new Gtk.Button.from_icon_name ("view-restore-symbolic", Gtk.IconSize.BUTTON);
- unfullscreen_button.tooltip_text = _("Unfullscreen");
- unfullscreen_button.clicked.connect (() => {unfullscreen ();});
- unfullscreen_revealer.add (unfullscreen_button);
- unfullscreen_revealer.show_all ();
return unfullscreen_revealer;
}
private new void set_reveal_child (bool reveal) {
base.set_reveal_child (reveal);
if (reveal == true && fullscreen == true) {
- unfullscreen_revealer.set_reveal_child (reveal);
+ unfullscreen_revealer.reveal_child = reveal;
} else if (reveal == false) {
- unfullscreen_revealer.set_reveal_child (reveal);
+ unfullscreen_revealer.reveal_child = reveal;
}
}
public override void get_preferred_width (out int minimum_width, out int natural_width) {
base.get_preferred_width (out minimum_width, out natural_width);
- if (parent.get_window () == null)
+ if (parent.get_window () == null) {
return;
+ }
var width = parent.get_window ().get_width ();
if (width > 0 && width >= minimum_width) {
@@ -181,19 +212,21 @@
}
public void reveal_control () {
- if (child_revealed == false)
+ if (child_revealed == false) {
set_reveal_child (true);
+ }
- if (hiding_timer != 0)
+ if (hiding_timer != 0) {
Source.remove (hiding_timer);
+ }
hiding_timer = GLib.Timeout.add (2000, () => {
- if (hovered == true || preferences_popover.visible == true || playlist_popover.visible == true || playing == false) {
+ if (hovered || preferences_popover.visible || playlist_popover.visible || !playing) {
hiding_timer = 0;
return false;
}
set_reveal_child (false);
- unfullscreen_revealer.set_reveal_child (false);
+ unfullscreen_revealer.reveal_child = false;
hiding_timer = 0;
return false;
});