commit 764dd94a7f5cac3426a58d3f7efbcf8d1b8c787f
author Evgeny Stambulchik <fnevgeny@gmail.com> Wed Aug 21 00:40:13 2019 +0300
committer Albert Astals Cid <aacid@kde.org> Wed Aug 21 17:10:07 2019 +0200
tree afb56c96ab5569b29e4d85c4ad3eb177ebe13783
parent 8c2c5c46aba84d714f6c8f779eda0646b31b956b

Make poppler_movie_get_volume() return double 0.0-1.0

glib/demo/utils.c

diff --git a/glib/demo/utils.c b/glib/demo/utils.c
index 9c66c7f..a8b0c68 100644
--- a/glib/demo/utils.c
+++ b/glib/demo/utils.c
@@ -593,7 +593,7 @@
         enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (POPPLER_TYPE_MOVIE_PLAY_MODE), poppler_movie_get_play_mode (movie));
         pgd_table_add_property (GTK_GRID (table), "<b>Play Mode:</b>", enum_value->value_name, &row);
 	pgd_table_add_property (GTK_GRID (table), "<b>Synchronous Play:</b>", poppler_movie_is_synchronous (movie) ? "Yes" : "No", &row);
-	pgd_table_add_property (GTK_GRID (table), "<b>Volume:</b>", g_strdup_printf("%i", poppler_movie_get_volume (movie)), &row);
+	pgd_table_add_property (GTK_GRID (table), "<b>Volume:</b>", g_strdup_printf("%g", poppler_movie_get_volume (movie)), &row);
 	pgd_table_add_property (GTK_GRID (table), "<b>Rate:</b>", g_strdup_printf("%g", poppler_movie_get_rate (movie)), &row);
         poppler_movie_get_start (movie, &start);
         pgd_table_add_property (GTK_GRID (table), "<b>Start:</b>", g_strdup_printf("%lu/%i s", start.units, start.units_per_second), &row);

glib/poppler-movie.cc

diff --git a/glib/poppler-movie.cc b/glib/poppler-movie.cc
index f9ee8dc..ce5e7ba 100644
--- a/glib/poppler-movie.cc
+++ b/glib/poppler-movie.cc
@@ -228,16 +228,16 @@
  *
  * Returns the playback audio volume
  *
- * Return value: volume setting for the movie (0 - 100)
+ * Return value: volume setting for the movie (0.0 - 1.0)
  *
  * Since: 0.80
  */
-gint
+gdouble
 poppler_movie_get_volume (PopplerMovie *poppler_movie)
 {
   g_return_val_if_fail (POPPLER_IS_MOVIE (poppler_movie), 0);
 
-  return poppler_movie->volume;
+  return poppler_movie->volume/100.0;
 }
 
 /**

glib/poppler-movie.h

diff --git a/glib/poppler-movie.h b/glib/poppler-movie.h
index 0175088..52b3d7b 100644
--- a/glib/poppler-movie.h
+++ b/glib/poppler-movie.h
@@ -78,7 +78,7 @@
 POPPLER_PUBLIC
 gboolean             poppler_movie_is_synchronous (PopplerMovie *poppler_movie);
 POPPLER_PUBLIC
-gint                 poppler_movie_get_volume (PopplerMovie *poppler_movie);
+gdouble              poppler_movie_get_volume (PopplerMovie *poppler_movie);
 POPPLER_PUBLIC
 gdouble              poppler_movie_get_rate (PopplerMovie *poppler_movie);
 POPPLER_PUBLIC