Skip to content
Commits on Source (151)
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ c3770a58
......@@ -38,14 +38,14 @@ variables:
xorg-x11-server-Xvfb
build-fedora:
image: fedora:36
image: fedora:37
stage: test
tags:
- crun
before_script:
- dnf update -y
- dnf install --setopt=install_weak_deps=False -y $FEDORA_DEPS
# See https://bugzilla.redhat.com/show_bug.cgi?id=1896438
# https://github.com/PyCQA/pylint/issues/6352
- dnf remove -y pylint
script:
- meson _build -Dhelp=true -Denable-gtk-doc=true -Denable-easy-codec-installation=yes -Denable-python=yes -Dprofile=default
......@@ -61,7 +61,6 @@ build-fedora:
flatpak:master:
extends: .flatpak
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
stage: test
variables:
# Replace with your manifest path
......
COPYING
View file @ c3770a58
......@@ -342,13 +342,12 @@ consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
The Totem project hereby grants permission for non-GPL compatible
GStreamer plugins to be used and distributed together with GStreamer and
Totem. This permission is above and beyond the permissions granted by
the GPL license by which Totem is covered. If you modify this code, you may
extend this exception to your version of the code, but you are not obligated
to do so. If you do not wish to do so, delete this exception statement from
your version.
This project hereby grants permission for non-GPL compatible GStreamer plugins
to be used and distributed together with GStreamer and this project. This
permission is above and beyond the permissions granted by the GPL license
by which this project is covered. If you modify this code, you may extend this
exception to your version of the code, but you are not obligated to do so.
If you do not wish to do so, delete this exception statement from your version.
Note that the src/totem-subtitle-encoding.c file was relicensed to LGPL
(see http://bugzilla.gnome.org/show_bug.cgi?id=515809).
NEWS
View file @ c3770a58
New features and significant updates in version...
Major changes in 43.beta:
- Throw a better error if OpenGL couldn't init
- Translate DVD/VCD device errors
- Save screenshots into ~/Pictures/Screenshots
- Make search entry keyboard navigable
- Add playlist page to GTK inspector (disabled by default)
- Fix fullscreen header bar not showing up
Major changes in 43.alpha:
- Update thumbnailing code for gnome-desktop API changes
- Fix crashes and warnings when some plugins are missing
- Use GResources to load UI files, simplify plugin declarations,
and remove a lot of unused code
- Update man page
Major changes in 42.0:
- Updated appdata screenshots
- Fix screenshot functionality not working since the port to
......
data/appdata/org.gnome.Totem.appdata.xml.in.in
View file @ c3770a58
......@@ -38,7 +38,7 @@
<release version="42.0" date="2022-03-18">
<description>
<p>
We are proud to announce Videos 3.34.0 as the latest stable version.
We are proud to announce Videos 42.0 as the latest stable version.
</p>
<p>
This new version stops relying on clutter for its video output. The
......
data/icons/meson.build
View file @ c3770a58
......@@ -8,3 +8,9 @@ install_data(
rename : [application_id + '-symbolic.svg'],
install_dir: join_paths(totem_datadir, 'icons', 'hicolor', 'symbolic', 'apps')
)
install_data(
join_paths('symbolic', 'tv-symbolic.svg'),
rename : ['totem-tv-symbolic.svg'],
install_dir: join_paths(totem_datadir, 'icons', 'hicolor', 'symbolic', 'apps')
)
data/icons/symbolic/tv-symbolic.svg 0 → 100644
View file @ c3770a58
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#2e3436"><path d="M4 3C2.338 3 1 4.338 1 6v7c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3V6c0-1.662-1.338-3-3-3zm.5 1h7S13 5 13 8s-1.5 4-1.5 4h-7S3 11 3 8s1.5-4 1.5-4zM11 14h1v1h-1z"/><path d="M6 1a1 1 0 01-1 1 1 1 0 01-1-1 1 1 0 011-1 1 1 0 011 1zm5.988 0a1 1 0 01-1 1 1 1 0 01-1-1 1 1 0 011-1 1 1 0 011 1z" style="marker:none" color="#000" overflow="visible"/><path d="M5.355.648l-.71.704 2.618 2.654 1.508-.024 2.586-2.632-.713-.7-2.299 2.34-.67.01z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/></g></svg>
\ No newline at end of file
data/meson.build
View file @ c3770a58
......@@ -36,16 +36,6 @@ else
message('Man page generation disabled')
endif
ui_files = files(
'shortcuts.ui',
'totem.ui',
)
install_data(
ui_files,
install_dir: totem_pkgdatadir
)
ui_resources = gnome.compile_resources(
'totemresources',
'totem.gresource.xml',
......
data/org.gnome.totem.gschema.xml.in
View file @ c3770a58
......@@ -58,7 +58,7 @@
<key name="screenshot-save-uri" type="s">
<default>''</default>
<summary>Default location for the “Take Screenshot” dialogs</summary>
<description>Default location for the “Take Screenshot” dialogs. Default is the Pictures directory.</description>
<description>Default location for the “Take Screenshot” dialogs. Default is the Screenshots directory.</description>
</key>
<key name="disable-user-plugins" type="b">
<default>false</default>
......
data/totem.1
View file @ c3770a58
......@@ -13,26 +13,23 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this; if not write to the Free Software Foundation, Inc.
.\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
.TH totem 1 "2008\-08\-25" "GNOME"
.TH totem 1 "2022\-06\-20" "GNOME"
.SH NAME
Totem \- GNOME desktop movie player based on GStreamer
GNOME Videos \- Movie player
.SH SYNOPSIS
.B totem
.RI [ option... ] " " [ filenames | URI ]
.SH DESCRIPTION
.B Totem
.B Videos
is a movie player for the GNOME desktop. Through use of the
.B GStreamer
backend many popular file and streaming formats are supported including:
MPEG audio and video (MP3/MPV), Ogg, AVI, ASF, MOV, WMV,
QuickTime, and more. Playing of DVD and VCD media is
also possible.
Although primarily intended as a movie player,
.B Totem
can also play many audio formats.
H.264 (AVC) and H.265 (HEVC) MPEG-4, WebM and AV1, MPEG-2 and MPEG-1, as well
as legacy videos types: Ogg, AVI, ASF, MOV, WMV, QuickTime, and more.
Playback of DVDs is also possible.
.P
For additional documentation on interactive use of
.B Totem
.B Videos
select the
.I Help
menu option. The menus allow access to some features not
......@@ -49,143 +46,88 @@ should be reported as a documentation bug.)
Output version information then quit.
.P
The following options command an already-running instance of
.B Totem
.B Videos
to do something; they are useful for remote-control scripting. If
.B Totem
.B Videos
is not already running, these commands will launch a new instance of
.B Totem
.B Videos
but will not do anything further.
.TP
.B --play-pause
Tell an already-running instance of
.B Totem
.B Videos
to toggle between play and pause.
.TP
.B --play
Tell an already-running instance of
.B Totem
.B Videos
to play (has no effect if already playing)
.TP
.B --pause
Tell an already-running instance of
.B Totem
.B Videos
to pause (has no effect if already paused)
.TP
.B --next
Tell an already-running instance of
.B Totem
.B Videos
to skip to the next movie or chapter in the playlist.
.TP
.B --previous
Tell an already-running instance of
.B Totem
.B Videos
to return to the previous movie or chapter in the playlist.
.TP
.B --seek-fwd
Tell an already-running instance of
.B Totem
.B Videos
to seek forwards 15 seconds in the current movie.
.TP
.B --seek-bwd
Tell an already-running instance of
.B Totem
.B Videos
to seek backwards 15 seconds in the current movie.
.TP
.B --volume-up
Tell an already-running instance of
.B Totem
.B Videos
to raise the volume by 8%.
.TP
.B --volume-down
Tell an already-running instance of
.B Totem
.B Videos
to lower the volume by 8%.
.TP
.B --mute
Tell an already-running instance of
.B Totem
.B Videos
to toggle between muted and unmuted audio.
.TP
.B --fullscreen
Tell an already-running instance of
.B Totem
.B Videos
to toggle fullscreen mode.
.TP
.B --quit
Tell an already-running instance of
.B Totem
.B Videos
to quit.
.TP
.BI "--enqueue " filename|URI
Tell an already-running instance of Totem to add a new stream
to the playlist.
Tell an already-running instance of
.B Videos
to add a new stream to the playlist.
.TP
.BI "--replace " filename|URI
Tell an already-running instance of Totem to play
from the playlist.
Tell an already-running instance of
.B Videos
to play from the playlist.
.SH KEYBINDINGS
Global keybindings for
.BR Totem :
.P
.ta \w'Down-arrow 'u
a cycle between aspect ratios
.br
p toggle between play and pause
.br
Esc exit full screen mode
.br
f toggle full screen
.br
h toggle display of on-screen controls
.br
0 resize window to 50% original size
.br
1 resize window to 100% original size
.br
2 resize window to 200% original size
.br
.br
r zoom in the video
.br
t zoom out the video
.br
d start and stop the telestrator (drawing) mode
.br
e erase the drawing
.br
Left-arrow skip back 15 seconds
.br
Right-arrow skip forward 60 seconds
.br
Shift+Left-arrow skip back 5 seconds
.br
Shift+Right-arrow skip forward 15 seconds
.br
Ctrl+Left-arrow skip back 3 minutes
.br
Ctrl+Right arrow skip forward 10 minutes
.br
Up-arrow increase volume by 8%
.br
Down-arrow decrease volume by 8%
.br
b jump back to previous chapter/movie in playlist
.br
n jump to next chapter/movie in playlist
.br
q quit
.br
Ctrl+E eject the playing optical media
.br
Ctrl+O open a new file
.br
Ctrl+L open a new URI
.br
F9 toggle display of the playlist
.br
m show the DVD menu
.br
c show the DVD chapter menu
Information about keybindings is available once the application
is started by typing
.B Ctrl+Question Mark
which might require pressing Shift in some keyboard configurations.
.TP
.SH FILES
.I /usr/lib/totem/plugins/
.RS
......@@ -205,17 +147,17 @@ The configuration file for the main window's appearance, stored in a
simple INI format.
.RE
.SH BUGS
.B Totem
.B Videos
cannot play files using some proprietary codecs.
.SH AUTHOR
.B Totem
.B Videos
was written by Bastien Nocera <hadess@hadess.net>.
This manual page was written by Andre Lehovich for the
Debian Project.
.SH DISTRIBUTION
The latest version of Totem may be downloaded from
.UR https://wiki.gnome.org/Apps/Videos
<https://wiki.gnome.org/Apps/Videos>
The latest version of Videos may be downloaded from
.UR https://flathub.org/apps/details/org.gnome.Totem
<https://flathub.org/apps/details/org.gnome.Totem>
.UE
.SH SEE ALSO
.BR "totem-video-thumbnailer" (1),
......
data/totem.gresource.xml
View file @ c3770a58
......@@ -4,5 +4,7 @@
<file compressed="true">totem-preferences-dialog.ui</file>
<file compressed="true">playlist.ui</file>
<file compressed="true">uri.ui</file>
<file compressed="true">shortcuts.ui</file>
<file compressed="true">totem.ui</file>
</gresource>
</gresources>
debian/changelog
View file @ c3770a58
totem (43~beta-1ubuntu1) kinetic; urgency=medium
* Resynchronize with Debian. Remaining changes:
- debian/control.in:
+ Don't recommend gstreamer1.0-pulseaudio
+ Use ubuntu-desktop vcs
- debian/gbp.conf: Use ubuntu settings
- Add 91_quicklist_entries.patch:
+ Add static quicklist.
* Drop Add-Mute-action.patch: the function was declared private
* Modify 91_quicklist_entries.patch to drop Mute action
-- Jeremy Bicha <jbicha@ubuntu.com> Wed, 24 Aug 2022 14:16:02 -0400
totem (43~beta-1) unstable; urgency=medium
* New upstream release
* debian/control.in: Bump minimum glib to 2.72.0
* debian/control.in: Bump minimum libx11 to 1.8
* debian/control.in: Build-Depend on libportal-gtk
* debian/totem-common.install: Update
* Drop gnome-desktop patch: applied in new release
-- Jeremy Bicha <jbicha@ubuntu.com> Wed, 24 Aug 2022 12:27:20 -0400
totem (42.0-2ubuntu1) kinetic; urgency=medium
* Resynchronize with Debian. Remaining changes:
......
debian/control
View file @ c3770a58
......@@ -28,7 +28,7 @@ Build-Depends: appstream-util,
libgdata-dev (>= 0.8.0),
libgdk-pixbuf-2.0-dev (>= 2.23.0) | libgdk-pixbuf2.0-dev (>= 2.23.0),
libgirepository1.0-dev (>= 0.9.12),
libglib2.0-dev (>= 2.56.0),
libglib2.0-dev (>= 2.72.0),
libgnome-desktop-3-dev,
libgrilo-0.3-dev (>= 0.3.0),
libgstreamer-plugins-base1.0-dev,
......@@ -36,9 +36,11 @@ Build-Depends: appstream-util,
libgtk-3-dev (>= 3.22.0),
libhandy-1-dev (>= 1.5.90),
libpeas-dev (>= 1.1.0),
libportal-gtk3-dev,
librsvg2-dev (>= 2.16.0-2),
libsoup2.4-dev,
libtotem-plparser-dev (>= 3.26.5),
libx11-dev (>= 2:1.8),
libxml2-dev (>= 2.6.0),
meson (>= 0.50.0),
python3 (>= 3.2),
......
debian/control.in
View file @ c3770a58
......@@ -24,7 +24,7 @@ Build-Depends: appstream-util,
libgdata-dev (>= 0.8.0),
libgdk-pixbuf-2.0-dev (>= 2.23.0) | libgdk-pixbuf2.0-dev (>= 2.23.0),
libgirepository1.0-dev (>= 0.9.12),
libglib2.0-dev (>= 2.56.0),
libglib2.0-dev (>= 2.72.0),
libgnome-desktop-3-dev,
libgrilo-0.3-dev (>= 0.3.0),
libgstreamer-plugins-base1.0-dev,
......@@ -32,9 +32,11 @@ Build-Depends: appstream-util,
libgtk-3-dev (>= 3.22.0),
libhandy-1-dev (>= 1.5.90),
libpeas-dev (>= 1.1.0),
libportal-gtk3-dev,
librsvg2-dev (>= 2.16.0-2),
libsoup2.4-dev,
libtotem-plparser-dev (>= 3.26.5),
libx11-dev (>= 2:1.8),
libxml2-dev (>= 2.6.0),
meson (>= 0.50.0),
python3 (>= 3.2),
......
debian/patches/91_quicklist_entries.patch
View file @ c3770a58
......@@ -10,14 +10,14 @@ Origin: vendor
Forwarded: https://bugzilla.gnome.org/671088
Reviewed-By: Stéphane Graber <stgraber@ubuntu.com>
---
data/org.gnome.Totem.desktop.in.in | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
data/org.gnome.Totem.desktop.in.in | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/data/org.gnome.Totem.desktop.in.in b/data/org.gnome.Totem.desktop.in.in
index d7b2ab6..af1d79e 100644
index d7b2ab6..7d51471 100644
--- a/data/org.gnome.Totem.desktop.in.in
+++ b/data/org.gnome.Totem.desktop.in.in
@@ -18,3 +18,25 @@ X-GNOME-Bugzilla-Version=@VERSION@
@@ -18,3 +18,21 @@ X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Bugzilla-OtherBinaries=totem-video-thumbnailer;
StartupNotify=true
MimeType=@MIME_TYPE@
......@@ -36,10 +36,6 @@ index d7b2ab6..af1d79e 100644
+Name=Previous
+Exec=totem --previous
+
+[Desktop Action mute]
+Name=Mute
+Exec=totem --mute
+
+[Desktop Action fullscreen]
+Name=Fullscreen
+Exec=totem --fullscreen
debian/patches/Add-Mute-action.patch deleted 100644 → 0
View file @ c043c824
From: Simone Piccardi <simone.piccardi@gmail.com>
Date: Tue, 15 Jan 2019 15:30:16 -0500
Subject: Add Mute action
Forwarded: https://gitlab.gnome.org/GNOME/totem/merge_requests/32
---
src/totem-menu.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 143d01c..d3b3b0b 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -310,6 +310,14 @@ remote_command_cb (GSimpleAction *action,
totem_object_remote_command (totem, cmd, url);
}
+static void
+mute_action_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ TOTEM_PROFILE (totem_object_volume_toggle_mute (TOTEM_OBJECT (user_data)));
+}
+
static GActionEntry app_entries[] = {
/* Main app menu */
{ "main-menu", main_menu_cb, NULL, NULL, NULL },
@@ -321,6 +329,7 @@ static GActionEntry app_entries[] = {
{ "shortcuts", keyboard_shortcuts_action_cb, NULL, NULL, NULL },
{ "help", help_action_cb, NULL, NULL, NULL },
{ "quit", quit_action_cb, NULL, NULL, NULL },
+ { "mute", mute_action_cb, NULL, NULL, NULL },
/* "Go" menu */
{ "dvd-root-menu", dvd_root_menu_action_cb, NULL, NULL, NULL },
debian/patches/icon-helpers-adjust-for-gnome-desktop-thumbnail-API-chang.patch deleted 100644 → 0
View file @ c043c824
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Mon, 11 Apr 2022 15:50:21 -0500
Subject: icon-helpers: adjust for gnome-desktop thumbnail API changes
See gnome-desktop!132
(cherry picked from commit cc3c38db9588611b2e0ac9e74f1464b975c76a89)
---
src/icon-helpers.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/icon-helpers.c b/src/icon-helpers.c
index bdeb0fa..29c43be 100644
--- a/src/icon-helpers.c
+++ b/src/icon-helpers.c
@@ -194,6 +194,9 @@ thumbnail_media_async_thread (GTask *task,
const char *uri;
GDateTime *mtime;
gint64 unix_date;
+#if defined(GNOME_DESKTOP_PLATFORM_VERSION) && GNOME_DESKTOP_PLATFORM_VERSION >= 43
+ GError *error = NULL;
+#endif
if (g_task_return_error_if_cancelled (task)) {
g_object_unref (task);
@@ -220,6 +223,24 @@ thumbnail_media_async_thread (GTask *task,
return;
}
+#if defined(GNOME_DESKTOP_PLATFORM_VERSION) && GNOME_DESKTOP_PLATFORM_VERSION >= 43
+ tmp_pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, uri, "video/x-totem-stream", NULL, &error);
+
+ if (!tmp_pixbuf) {
+ g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Thumbnailing failed: %s", error->message);
+ g_object_unref (task);
+ g_error_free (error);
+ return;
+ }
+
+ gnome_desktop_thumbnail_factory_save_thumbnail (factory, tmp_pixbuf, uri, unix_date, NULL, &error);
+ if (error) {
+ g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Thumbnailing failed: %s", error->message);
+ g_object_unref (task);
+ g_error_free (error);
+ return;
+ }
+#else
tmp_pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, uri, "video/x-totem-stream");
if (!tmp_pixbuf) {
@@ -229,6 +250,7 @@ thumbnail_media_async_thread (GTask *task,
}
gnome_desktop_thumbnail_factory_save_thumbnail (factory, tmp_pixbuf, uri, unix_date);
+#endif
/* Save the thumbnail URL for the bookmarks source */
save_bookmark_thumbnail (media, uri);
debian/patches/series
View file @ c3770a58
debian/Don-t-run-pylint-at-build-time.patch
icon-helpers-adjust-for-gnome-desktop-thumbnail-API-chang.patch
91_quicklist_entries.patch
Add-Mute-action.patch
debian/totem-common.install
View file @ c3770a58
......@@ -7,4 +7,3 @@ usr/share/icons
usr/share/locale
usr/share/man
usr/share/thumbnailers
usr/share/totem
docs/reference/meson.build
View file @ c3770a58
......@@ -4,7 +4,6 @@ private_headers = [
'bacon-time-label.h',
'bacon-video-widget-gst-missing-plugins.h',
'bacon-video-widget-properties.h',
'gd-tagged-entry.h',
'icon-helpers.h',
'screenshot-filename-builder.h',
'totem-gallery-progress.h',
......
docs/reference/totem-sections.txt
View file @ c3770a58
......@@ -101,7 +101,6 @@ totem_interface_create_header_button
totem_interface_error
totem_interface_error_blocking
<SUBSECTION Private>
totem_interface_load
</SECTION>
<SECTION>
......