[Xfce4-commits] [apps/parole] 01/01: cpplint: Another batch of whitespace fixes Extra space before ( in function call [whitespace/parens] [4] Mismatching spaces inside () in if [whitespace/parens] [5] Missing space after , [whitespace/comma] [3] Missing space before ( in while( [whitespace/parens] [5]
noreply at xfce.org
noreply at xfce.org
Mon May 29 01:01:58 CEST 2017
This is an automated email from the git hooks/post-receive script.
bluesabre pushed a commit to branch master
in repository apps/parole.
commit e41ba5f75005cb86354f831388c0c4e9376f0737
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun May 28 19:01:14 2017 -0400
cpplint: Another batch of whitespace fixes
Extra space before ( in function call [whitespace/parens] [4]
Mismatching spaces inside () in if [whitespace/parens] [5]
Missing space after , [whitespace/comma] [3]
Missing space before ( in while( [whitespace/parens] [5]
---
src/common/parole-common.c | 60 +-
src/common/parole-rc-utils.c | 54 +-
src/common/parole-screensaver.c | 30 +-
src/dbus/parole-dbus.c | 70 +-
src/gst/parole-gst.c | 1202 ++++++++++----------
src/main.c | 174 +--
src/misc/parole-debug.c | 32 +-
src/misc/parole-file.c | 204 ++--
src/misc/parole-filters.c | 68 +-
src/misc/parole-pl-parser.c | 302 ++---
src/misc/parole-provider-player.c | 112 +-
src/misc/parole-provider-plugin.c | 20 +-
src/misc/parole-stream.c | 304 ++---
src/parole-about.c | 4 +-
src/parole-builder.c | 22 +-
src/parole-button.c | 74 +-
src/parole-clutter.c | 130 +--
src/parole-conf-dialog.c | 298 ++---
src/parole-conf.c | 302 ++---
src/parole-disc.c | 230 ++--
src/parole-mediachooser.c | 158 +--
src/parole-medialist.c | 1000 ++++++++--------
src/parole-module.c | 106 +-
src/parole-open-location.c | 84 +-
src/parole-player.c | 2076 +++++++++++++++++-----------------
src/parole-plugin-player.c | 162 +--
src/parole-plugins-manager.c | 372 +++---
src/parole-shortcuts.c | 38 +-
src/parole-subtitle-encoding.c | 96 +-
src/parole-utils.c | 276 ++---
src/parole-vis.c | 20 +-
src/plugins/mpris2/mpris2-plugin.c | 12 +-
src/plugins/mpris2/mpris2-provider.c | 368 +++---
src/plugins/notify/notify-plugin.c | 12 +-
src/plugins/notify/notify-provider.c | 114 +-
src/plugins/sample/sample-plugin.c | 12 +-
src/plugins/sample/sample-provider.c | 26 +-
src/plugins/tray/tray-plugin.c | 12 +-
src/plugins/tray/tray-provider.c | 262 ++---
39 files changed, 4449 insertions(+), 4449 deletions(-)
diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index 0faeee2..c3f2e17 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -35,17 +35,17 @@
#include "parole-common.h"
gboolean
-parole_widget_reparent (GtkWidget *widget, GtkWidget *new_parent)
+parole_widget_reparent(GtkWidget *widget, GtkWidget *new_parent)
{
GtkWidget *parent;
parent = gtk_widget_get_parent(widget);
if (parent)
{
- g_object_ref (widget);
- gtk_container_remove (GTK_CONTAINER(parent), widget);
- gtk_container_add (GTK_CONTAINER(new_parent), widget);
- g_object_unref (widget);
+ g_object_ref(widget);
+ gtk_container_remove(GTK_CONTAINER(parent), widget);
+ gtk_container_add(GTK_CONTAINER(new_parent), widget);
+ g_object_unref(widget);
return TRUE;
}
@@ -54,7 +54,7 @@ parole_widget_reparent (GtkWidget *widget, GtkWidget *new_parent)
}
static void
-parole_dialog_show (GtkWindow *parent,
+parole_dialog_show(GtkWindow *parent,
GtkMessageType type,
const gchar *window_title,
const gchar *title,
@@ -62,77 +62,77 @@ parole_dialog_show (GtkWindow *parent,
{
GtkWidget *dialog;
- dialog = gtk_message_dialog_new_with_markup (parent,
+ dialog = gtk_message_dialog_new_with_markup(parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
type,
GTK_BUTTONS_CLOSE,
"<span size='larger'><b>%s</b></span>",
title);
- gtk_window_set_title (GTK_WINDOW (dialog), window_title);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), "parole");
+ gtk_window_set_title(GTK_WINDOW(dialog), window_title);
+ gtk_window_set_icon_name(GTK_WINDOW(dialog), "parole");
- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", msg);
+ gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog), "%s", msg);
- g_signal_connect_swapped (dialog,
+ g_signal_connect_swapped(dialog,
"response",
- G_CALLBACK (gtk_widget_destroy),
+ G_CALLBACK(gtk_widget_destroy),
dialog);
- gtk_widget_show_all (dialog);
+ gtk_widget_show_all(dialog);
}
-void parole_dialog_info (GtkWindow *parent, const gchar *title, const gchar *msg)
+void parole_dialog_info(GtkWindow *parent, const gchar *title, const gchar *msg)
{
- parole_dialog_show (parent, GTK_MESSAGE_INFO, _("Message"), title, msg);
+ parole_dialog_show(parent, GTK_MESSAGE_INFO, _("Message"), title, msg);
}
-void parole_dialog_error (GtkWindow *parent, const gchar *title, const gchar *msg)
+void parole_dialog_error(GtkWindow *parent, const gchar *title, const gchar *msg)
{
- parole_dialog_show (parent, GTK_MESSAGE_ERROR, _("Error"), title, msg);
+ parole_dialog_show(parent, GTK_MESSAGE_ERROR, _("Error"), title, msg);
}
-void parole_window_busy_cursor (GdkWindow *window)
+void parole_window_busy_cursor(GdkWindow *window)
{
GdkCursor *cursor = NULL;
if ( G_UNLIKELY (window == NULL) )
return;
- cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_WATCH);
+ cursor = gdk_cursor_new_for_display(gdk_display_get_default(), GDK_WATCH);
- gdk_window_set_cursor (window, cursor);
+ gdk_window_set_cursor(window, cursor);
if (cursor)
- g_object_unref (cursor);
+ g_object_unref(cursor);
- gdk_flush ();
+ gdk_flush();
}
-void parole_window_invisible_cursor (GdkWindow *window)
+void parole_window_invisible_cursor(GdkWindow *window)
{
GdkCursor *cursor = NULL;
if ( G_UNLIKELY (window == NULL) )
return;
- cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_BLANK_CURSOR);
+ cursor = gdk_cursor_new_for_display(gdk_display_get_default(), GDK_BLANK_CURSOR);
- gdk_window_set_cursor (window, cursor);
+ gdk_window_set_cursor(window, cursor);
if (cursor)
- g_object_unref (cursor);
+ g_object_unref(cursor);
- gdk_flush ();
+ gdk_flush();
}
-void parole_window_normal_cursor (GdkWindow *window)
+void parole_window_normal_cursor(GdkWindow *window)
{
if ( G_UNLIKELY (window == NULL) )
return;
- gdk_window_set_cursor (window, NULL);
+ gdk_window_set_cursor(window, NULL);
- gdk_flush ();
+ gdk_flush();
}
diff --git a/src/common/parole-rc-utils.c b/src/common/parole-rc-utils.c
index f6d50c5..e403048 100644
--- a/src/common/parole-rc-utils.c
+++ b/src/common/parole-rc-utils.c
@@ -33,85 +33,85 @@
#include "parole-rc-utils.h"
XfceRc *
-parole_get_resource_file (const gchar *group, gboolean readonly)
+parole_get_resource_file(const gchar *group, gboolean readonly)
{
gchar *file;
XfceRc *rc;
- file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, PAROLE_RESOURCE_FILE, TRUE);
- rc = xfce_rc_simple_open (file, readonly);
+ file = xfce_resource_save_location(XFCE_RESOURCE_CONFIG, PAROLE_RESOURCE_FILE, TRUE);
+ rc = xfce_rc_simple_open(file, readonly);
if (rc)
- xfce_rc_set_group (rc, group);
+ xfce_rc_set_group(rc, group);
- g_free (file);
+ g_free(file);
return rc;
}
-gchar **parole_get_history_full (const gchar *relpath)
+gchar **parole_get_history_full(const gchar *relpath)
{
gchar **lines = NULL;
gchar *history = NULL;
gchar *contents = NULL;
gsize length = 0;
- history = xfce_resource_lookup (XFCE_RESOURCE_CACHE, relpath);
+ history = xfce_resource_lookup(XFCE_RESOURCE_CACHE, relpath);
if (history && g_file_get_contents (history, &contents, &length, NULL))
{
- lines = g_strsplit (contents, "\n", -1);
- g_free (contents);
+ lines = g_strsplit(contents, "\n", -1);
+ g_free(contents);
}
- g_free (history);
+ g_free(history);
return lines;
}
-gchar **parole_get_history (void)
+gchar **parole_get_history(void)
{
return parole_get_history_full (PAROLE_HISTORY_FILE);
}
-void parole_insert_line_history (const gchar *line)
+void parole_insert_line_history(const gchar *line)
{
- parole_insert_line_history_full (PAROLE_HISTORY_FILE, line);
+ parole_insert_line_history_full(PAROLE_HISTORY_FILE, line);
}
-void parole_insert_line_history_full (const gchar *relpath, const gchar *line)
+void parole_insert_line_history_full(const gchar *relpath, const gchar *line)
{
gchar *history = NULL;
- history = xfce_resource_save_location (XFCE_RESOURCE_CACHE, relpath, TRUE);
+ history = xfce_resource_save_location(XFCE_RESOURCE_CACHE, relpath, TRUE);
if ( history ) {
FILE *f;
- f = fopen (history, "a");
- fprintf (f, "%s\n", line);
- fclose (f);
- g_free (history);
+ f = fopen(history, "a");
+ fprintf(f, "%s\n", line);
+ fclose(f);
+ g_free(history);
} else {
- g_warning ("Unable to open cache file");
+ g_warning("Unable to open cache file");
}
}
-void parole_clear_history_file (void)
+void parole_clear_history_file(void)
{
- parole_clear_history_file_full (PAROLE_HISTORY_FILE);
+ parole_clear_history_file_full(PAROLE_HISTORY_FILE);
}
-void parole_clear_history_file_full (const gchar *relpath)
+void parole_clear_history_file_full(const gchar *relpath)
{
gchar *history = NULL;
- history = xfce_resource_save_location (XFCE_RESOURCE_CACHE, relpath, FALSE);
+ history = xfce_resource_save_location(XFCE_RESOURCE_CACHE, relpath, FALSE);
if ( history )
{
FILE *f;
- f = fopen (history, "w");
- fclose (f);
- g_free (history);
+ f = fopen(history, "w");
+ fclose(f);
+ g_free(history);
}
}
diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c
index fefaf79..6fdace3 100644
--- a/src/common/parole-screensaver.c
+++ b/src/common/parole-screensaver.c
@@ -39,47 +39,47 @@
#define RESET_SCREENSAVER_TIMEOUT 6
#define PAROLE_SCREEN_SAVER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_SCREENSAVER, ParoleScreenSaverPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_SCREENSAVER, ParoleScreenSaverPrivate))
-G_DEFINE_TYPE (ParoleScreenSaver, parole_screen_saver, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleScreenSaver, parole_screen_saver, G_TYPE_OBJECT)
static void
-parole_screen_saver_finalize (GObject *object)
+parole_screen_saver_finalize(GObject *object)
{
- G_OBJECT_CLASS (parole_screen_saver_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_screen_saver_parent_class)->finalize(object);
}
static void
-parole_screen_saver_class_init (ParoleScreenSaverClass *klass)
+parole_screen_saver_class_init(ParoleScreenSaverClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_screen_saver_finalize;
}
static void
-parole_screen_saver_init (ParoleScreenSaver *saver)
+parole_screen_saver_init(ParoleScreenSaver *saver)
{
return;
}
ParoleScreenSaver *
-parole_screen_saver_new (void)
+parole_screen_saver_new(void)
{
ParoleScreenSaver *saver = NULL;
- saver = g_object_new (PAROLE_TYPE_SCREENSAVER, NULL);
+ saver = g_object_new(PAROLE_TYPE_SCREENSAVER, NULL);
return saver;
}
-void parole_screen_saver_inhibit (ParoleScreenSaver *saver, GtkWindow *window)
+void parole_screen_saver_inhibit(ParoleScreenSaver *saver, GtkWindow *window)
{
gchar *cmd;
gint returncode;
- g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
+ g_return_if_fail(PAROLE_IS_SCREENSAVER(saver));
- cmd = g_strdup_printf("xdg-screensaver suspend %i", (int)GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))));
+ cmd = g_strdup_printf("xdg-screensaver suspend %i", (int)GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(window))));
returncode = system(cmd);
TRACE("\'xdg-screensaver suspend\' returned %i", returncode);
@@ -87,14 +87,14 @@ void parole_screen_saver_inhibit (ParoleScreenSaver *saver, GtkWindow *window)
g_free(cmd);
}
-void parole_screen_saver_uninhibit (ParoleScreenSaver *saver, GtkWindow *window)
+void parole_screen_saver_uninhibit(ParoleScreenSaver *saver, GtkWindow *window)
{
gchar *cmd;
gint returncode;
- g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
+ g_return_if_fail(PAROLE_IS_SCREENSAVER(saver));
- cmd = g_strdup_printf("xdg-screensaver resume %i", (int)GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))));
+ cmd = g_strdup_printf("xdg-screensaver resume %i", (int)GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(window))));
returncode = system(cmd);
TRACE("\'xdg-screensaver resume\' returned %i", returncode);
diff --git a/src/dbus/parole-dbus.c b/src/dbus/parole-dbus.c
index aba863b..3eb1358 100644
--- a/src/dbus/parole-dbus.c
+++ b/src/dbus/parole-dbus.c
@@ -36,32 +36,32 @@
#include "parole-dbus.h"
static void
-proxy_destroy_cb (DBusGConnection *bus)
+proxy_destroy_cb(DBusGConnection *bus)
{
- dbus_g_connection_unref (bus);
+ dbus_g_connection_unref(bus);
}
static DBusConnection *
-parole_session_bus_get (void)
+parole_session_bus_get(void)
{
return dbus_g_connection_get_connection (parole_g_session_bus_get ());
}
DBusGConnection *
-parole_g_session_bus_get (void)
+parole_g_session_bus_get(void)
{
static gboolean session_bus_connected = FALSE;
DBusGConnection *bus;
GError *error = NULL;
- if ( G_LIKELY (session_bus_connected) ) {
- bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
+ if ( G_LIKELY(session_bus_connected) ) {
+ bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
} else {
- bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if ( error )
{
- g_error ("%s", error->message);
+ g_error("%s", error->message);
}
session_bus_connected = TRUE;
}
@@ -70,100 +70,100 @@ parole_g_session_bus_get (void)
}
DBusGProxy *
-parole_get_proxy (const gchar *path, const gchar *iface)
+parole_get_proxy(const gchar *path, const gchar *iface)
{
DBusGConnection *bus;
DBusGProxy *proxy;
- bus = parole_g_session_bus_get ();
+ bus = parole_g_session_bus_get();
- proxy = dbus_g_proxy_new_for_name (bus,
+ proxy = dbus_g_proxy_new_for_name(bus,
PAROLE_DBUS_NAME,
path,
iface);
if ( !proxy )
- g_error ("Unable to create proxy for %s", PAROLE_DBUS_NAME);
+ g_error("Unable to create proxy for %s", PAROLE_DBUS_NAME);
- g_signal_connect_swapped (proxy, "destroy",
- G_CALLBACK (proxy_destroy_cb), bus);
+ g_signal_connect_swapped(proxy, "destroy",
+ G_CALLBACK(proxy_destroy_cb), bus);
return proxy;
}
gboolean
-parole_dbus_name_has_owner (const gchar *name)
+parole_dbus_name_has_owner(const gchar *name)
{
DBusConnection *bus;
DBusError error;
gboolean ret;
- bus = parole_session_bus_get ();
+ bus = parole_session_bus_get();
- dbus_error_init (&error);
+ dbus_error_init(&error);
- ret = dbus_bus_name_has_owner (bus, name, &error);
+ ret = dbus_bus_name_has_owner(bus, name, &error);
- dbus_connection_unref (bus);
+ dbus_connection_unref(bus);
if ( dbus_error_is_set (&error) )
{
- g_warning ("Failed to get name owner: %s\n", error.message);
- dbus_error_free (&error);
+ g_warning("Failed to get name owner: %s\n", error.message);
+ dbus_error_free(&error);
}
return ret;
}
-gboolean parole_dbus_register_name (const gchar *name)
+gboolean parole_dbus_register_name(const gchar *name)
{
DBusConnection *bus;
DBusError error;
int ret;
- bus = parole_session_bus_get ();
+ bus = parole_session_bus_get();
- dbus_error_init (&error);
+ dbus_error_init(&error);
ret =
- dbus_bus_request_name (bus,
+ dbus_bus_request_name(bus,
name,
DBUS_NAME_FLAG_ALLOW_REPLACEMENT,
&error);
- dbus_connection_unref (bus);
+ dbus_connection_unref(bus);
if ( dbus_error_is_set (&error) )
{
- g_warning ("Error: %s\n", error.message);
- dbus_error_free (&error);
+ g_warning("Error: %s\n", error.message);
+ dbus_error_free(&error);
return FALSE;
}
return ret == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ? TRUE : FALSE;
}
-gboolean parole_dbus_release_name (const gchar *name)
+gboolean parole_dbus_release_name(const gchar *name)
{
DBusConnection *bus;
DBusError error;
int ret;
- bus = parole_session_bus_get ();
+ bus = parole_session_bus_get();
- dbus_error_init (&error);
+ dbus_error_init(&error);
ret =
- dbus_bus_release_name (bus,
+ dbus_bus_release_name(bus,
name,
&error);
- dbus_connection_unref (bus);
+ dbus_connection_unref(bus);
if ( dbus_error_is_set (&error) )
{
- g_warning ("Error: %s\n", error.message);
- dbus_error_free (&error);
+ g_warning("Error: %s\n", error.message);
+ dbus_error_free(&error);
return FALSE;
}
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index ada9c57..0cd1d27 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -63,21 +63,21 @@
#define HIDE_WINDOW_CURSOR_TIMEOUT 3.0f
#define PAROLE_GST_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_GST, ParoleGstPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_GST, ParoleGstPrivate))
-static void parole_gst_play_file_internal (ParoleGst *gst);
+static void parole_gst_play_file_internal(ParoleGst *gst);
-static void parole_gst_change_state (ParoleGst *gst,
+static void parole_gst_change_state(ParoleGst *gst,
GstState new);
-static void parole_gst_terminate_internal (ParoleGst *gst);
+static void parole_gst_terminate_internal(ParoleGst *gst);
-static GdkPixbuf *parole_gst_tag_list_get_cover_external (ParoleGst *gst);
+static GdkPixbuf *parole_gst_tag_list_get_cover_external(ParoleGst *gst);
-static GdkPixbuf *parole_gst_tag_list_get_cover_embedded (ParoleGst *gst,
+static GdkPixbuf *parole_gst_tag_list_get_cover_embedded(ParoleGst *gst,
GstTagList *tag_list);
-static GdkPixbuf *parole_gst_tag_list_get_cover (ParoleGst *gst,
+static GdkPixbuf *parole_gst_tag_list_get_cover(ParoleGst *gst,
GstTagList *tag_list);
typedef enum
@@ -173,59 +173,59 @@ static gpointer parole_gst_object = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (ParoleGst, parole_gst, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE(ParoleGst, parole_gst, GTK_TYPE_WIDGET)
static void
-parole_gst_finalize (GObject *object)
+parole_gst_finalize(GObject *object)
{
ParoleGst *gst;
- gst = PAROLE_GST (object);
+ gst = PAROLE_GST(object);
- TRACE ("start");
+ TRACE("start");
if ( gst->priv->tick_id != 0)
{
- g_source_remove (gst->priv->tick_id);
+ g_source_remove(gst->priv->tick_id);
gst->priv->tick_id = 0;
}
- parole_stream_init_properties (gst->priv->stream);
+ parole_stream_init_properties(gst->priv->stream);
if ( gst->priv->stream )
- g_object_unref (gst->priv->stream);
+ g_object_unref(gst->priv->stream);
if ( gst->priv->logo )
- g_object_unref (gst->priv->logo);
+ g_object_unref(gst->priv->logo);
if ( gst->priv->device )
- g_free (gst->priv->device);
+ g_free(gst->priv->device);
- g_mutex_clear (&gst->priv->lock);
+ g_mutex_clear(&gst->priv->lock);
- G_OBJECT_CLASS (parole_gst_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_gst_parent_class)->finalize(object);
}
static gboolean
-parole_gst_configure_event_cb (GtkWidget *widget, GdkEventConfigure *ev, ParoleGst *gst)
+parole_gst_configure_event_cb(GtkWidget *widget, GdkEventConfigure *ev, ParoleGst *gst)
{
return FALSE;
}
static gboolean
-parole_gst_parent_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
+parole_gst_parent_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
{
- cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
- cairo_paint (cr);
+ cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
+ cairo_paint(cr);
return FALSE;
}
static void
-parole_gst_realize (GtkWidget *widget)
+parole_gst_realize(GtkWidget *widget)
{
ParoleGst *gst;
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
GdkWindowAttr attr;
#if GTK_CHECK_VERSION(3, 22, 0)
#else
@@ -233,8 +233,8 @@ parole_gst_realize (GtkWidget *widget)
#endif
gint mask;
- gtk_widget_set_realized (widget, TRUE);
- gst = PAROLE_GST (widget);
+ gtk_widget_set_realized(widget, TRUE);
+ gst = PAROLE_GST(widget);
gtk_widget_get_allocation(widget, allocation);
@@ -242,10 +242,10 @@ parole_gst_realize (GtkWidget *widget)
attr.y = allocation->y;
attr.width = allocation->width;
attr.height = allocation->height;
- attr.visual = gtk_widget_get_visual (widget);
+ attr.visual = gtk_widget_get_visual(widget);
attr.wclass = GDK_INPUT_OUTPUT;
attr.window_type = GDK_WINDOW_CHILD;
- attr.event_mask = gtk_widget_get_events (widget) |
+ attr.event_mask = gtk_widget_get_events(widget) |
GDK_EXPOSURE_MASK |
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
@@ -254,38 +254,38 @@ parole_gst_realize (GtkWidget *widget)
mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
- gtk_widget_set_window(widget, gdk_window_new (gtk_widget_get_parent_window (widget),
+ gtk_widget_set_window(widget, gdk_window_new(gtk_widget_get_parent_window(widget),
&attr, mask) );
- gdk_window_set_user_data (gtk_widget_get_window(widget), widget);
+ gdk_window_set_user_data(gtk_widget_get_window(widget), widget);
#if GTK_CHECK_VERSION(3, 22, 0)
#else
- gdk_rgba_parse (&color, "black");
- gdk_window_set_background_rgba (gtk_widget_get_window(widget), &color);
+ gdk_rgba_parse(&color, "black");
+ gdk_window_set_background_rgba(gtk_widget_get_window(widget), &color);
#endif
- g_signal_connect (gtk_widget_get_toplevel (widget), "configure_event",
- G_CALLBACK (parole_gst_configure_event_cb), gst);
+ g_signal_connect(gtk_widget_get_toplevel(widget), "configure_event",
+ G_CALLBACK(parole_gst_configure_event_cb), gst);
- g_signal_connect (gtk_widget_get_parent(gtk_widget_get_parent (widget)), "draw",
- G_CALLBACK (parole_gst_parent_expose_event), NULL);
+ g_signal_connect(gtk_widget_get_parent(gtk_widget_get_parent(widget)), "draw",
+ G_CALLBACK(parole_gst_parent_expose_event), NULL);
g_free(allocation);
}
static void
-parole_gst_show (GtkWidget *widget)
+parole_gst_show(GtkWidget *widget)
{
if ( gtk_widget_get_window(widget) )
- gdk_window_show (gtk_widget_get_window(widget));
+ gdk_window_show(gtk_widget_get_window(widget));
if ( GTK_WIDGET_CLASS (parole_gst_parent_class)->show )
- GTK_WIDGET_CLASS (parole_gst_parent_class)->show (widget);
+ GTK_WIDGET_CLASS(parole_gst_parent_class)->show(widget);
}
static void
-parole_gst_get_video_output_size (ParoleGst *gst, gint *ret_w, gint *ret_h)
+parole_gst_get_video_output_size(ParoleGst *gst, gint *ret_w, gint *ret_h)
{
/*
* Default values returned if:
@@ -293,7 +293,7 @@ parole_gst_get_video_output_size (ParoleGst *gst, gint *ret_w, gint *ret_h)
* 2) Playing audio.
* 3) Playing video but we don't have its correct size yet.
*/
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
gtk_widget_get_allocation(GTK_WIDGET(gst), allocation);
*ret_w = allocation->width;
*ret_h = allocation->height;
@@ -307,7 +307,7 @@ parole_gst_get_video_output_size (ParoleGst *gst, gint *ret_w, gint *ret_h)
guint dar_n, dar_d;
guint disp_par_n, disp_par_d;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"has-video", &has_video,
"video-width", &video_w,
"video-height", &video_h,
@@ -354,12 +354,12 @@ parole_gst_get_video_output_size (ParoleGst *gst, gint *ret_w, gint *ret_h)
{
if (video_w % dar_n == 0) {
*ret_w = video_w;
- *ret_h = (guint) gst_util_uint64_scale (video_w, dar_d, dar_n);
+ *ret_h =(guint) gst_util_uint64_scale(video_w, dar_d, dar_n);
} else {
- *ret_w = (guint) gst_util_uint64_scale (video_h, dar_n, dar_d);
+ *ret_w =(guint) gst_util_uint64_scale(video_h, dar_n, dar_d);
*ret_h = video_h;
}
- TRACE ("Got best video size %dx%d fraction, %d/%d\n", *ret_w, *ret_h, disp_par_n, disp_par_d);
+ TRACE("Got best video size %dx%d fraction, %d/%d\n", *ret_w, *ret_h, disp_par_n, disp_par_d);
}
}
}
@@ -367,12 +367,12 @@ parole_gst_get_video_output_size (ParoleGst *gst, gint *ret_w, gint *ret_h)
}
static void
-parole_gst_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+parole_gst_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
{
#ifdef HAVE_CLUTTER
ParoleGst *gst;
#endif
- g_return_if_fail (allocation != NULL);
+ g_return_if_fail(allocation != NULL);
#ifdef HAVE_CLUTTER
gst = PAROLE_GST(parole_gst_get());
if (gst->priv->image_sink == CLUTTERSINK)
@@ -389,7 +389,7 @@ parole_gst_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
w = allocation->width;
h = allocation->height;
- parole_gst_get_video_output_size (PAROLE_GST (widget), &w, &h);
+ parole_gst_get_video_output_size(PAROLE_GST(widget), &w, &h);
width = w;
height = h;
@@ -402,18 +402,18 @@ parole_gst_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
width *= ratio;
height *= ratio;
- gdk_window_move_resize (gtk_widget_get_window(widget),
+ gdk_window_move_resize(gtk_widget_get_window(widget),
allocation->x + (allocation->width - width)/2,
allocation->y + (allocation->height - height)/2,
width,
height);
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw(widget);
}
}
static void
-parole_gst_set_video_color_balance (ParoleGst *gst)
+parole_gst_set_video_color_balance(ParoleGst *gst)
{
GstElement *video_sink;
@@ -425,81 +425,81 @@ parole_gst_set_video_color_balance (ParoleGst *gst)
if ( gst->priv->image_sink != XVIMAGESINK )
return;
- g_object_get (G_OBJECT (gst->priv->playbin),
+ g_object_get(G_OBJECT(gst->priv->playbin),
"video-sink", &video_sink,
NULL);
if ( !video_sink )
return;
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"brightness", &brightness_value,
"contrast", &contrast_value,
"hue", &hue_value,
"saturation", &saturation_value,
NULL);
- TRACE ("Setting video color balance");
+ TRACE("Setting video color balance");
- g_object_set (G_OBJECT (video_sink),
+ g_object_set(G_OBJECT(video_sink),
"brightness", brightness_value,
"contrast", contrast_value,
"hue", hue_value,
"saturation", saturation_value,
NULL);
- g_object_unref (G_OBJECT (video_sink));
+ g_object_unref(G_OBJECT(video_sink));
gst->priv->update_color_balance = FALSE;
}
static void
-parole_gst_set_video_overlay (ParoleGst *gst)
+parole_gst_set_video_overlay(ParoleGst *gst)
{
GstElement *video_sink;
- g_object_get (G_OBJECT (gst->priv->playbin),
+ g_object_get(G_OBJECT(gst->priv->playbin),
"video-sink", &video_sink,
NULL);
- g_assert (video_sink != NULL);
+ g_assert(video_sink != NULL);
if (GDK_IS_WINDOW (gtk_widget_get_window(GTK_WIDGET (gst))))
#if GST_CHECK_VERSION(1, 0, 0)
- gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (video_sink),
- GDK_WINDOW_XID (gtk_widget_get_window(GTK_WIDGET (gst))));
+ gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(video_sink),
+ GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(gst))));
#else
- gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (video_sink),
- GDK_WINDOW_XID (gtk_widget_get_window(GTK_WIDGET (gst))));
+ gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(video_sink),
+ GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(gst))));
#endif
- gst_object_unref (video_sink);
+ gst_object_unref(video_sink);
}
static void
-parole_gst_query_capabilities (ParoleGst *gst)
+parole_gst_query_capabilities(ParoleGst *gst)
{
GstQuery *query;
gboolean seekable;
- query = gst_query_new_seeking (GST_FORMAT_TIME);
+ query = gst_query_new_seeking(GST_FORMAT_TIME);
- if (gst_element_query (gst->priv->playbin, query)) {
- gst_query_parse_seeking (query,
+ if (gst_element_query(gst->priv->playbin, query)) {
+ gst_query_parse_seeking(query,
NULL,
&seekable,
NULL,
NULL);
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"seekable", seekable,
NULL);
}
- gst_query_unref (query);
+ gst_query_unref(query);
}
static gboolean
-parole_gst_tick_timeout (gpointer data)
+parole_gst_tick_timeout(gpointer data)
{
ParoleGst *gst;
GstFormat format = GST_FORMAT_TIME;
@@ -510,18 +510,18 @@ parole_gst_tick_timeout (gpointer data)
gboolean seekable;
gint64 duration;
- gst = PAROLE_GST (data);
+ gst = PAROLE_GST(data);
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"has-video", &video,
"seekable", &seekable,
"duration", &duration,
NULL);
#if GST_CHECK_VERSION(1, 0, 0)
- gst_element_query_position (gst->priv->playbin, format, &pos);
+ gst_element_query_position(gst->priv->playbin, format, &pos);
#else
- gst_element_query_position (gst->priv->playbin, &format, &pos);
+ gst_element_query_position(gst->priv->playbin, &format, &pos);
if ( G_UNLIKELY (format != GST_FORMAT_TIME ) )
return FALSE;
@@ -531,14 +531,14 @@ parole_gst_tick_timeout (gpointer data)
{
if (duration != 0 && seekable == FALSE)
{
- parole_gst_query_capabilities (gst);
+ parole_gst_query_capabilities(gst);
}
value = pos / GST_SECOND;
if ( G_LIKELY (value > 0) )
{
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_PROGRESSED], 0, gst->priv->stream, value);
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_PROGRESSED], 0, gst->priv->stream, value);
}
}
@@ -546,11 +546,11 @@ parole_gst_tick_timeout (gpointer data)
}
static void
-parole_gst_tick (ParoleGst *gst)
+parole_gst_tick(ParoleGst *gst)
{
gboolean live;
- g_object_get (gst->priv->stream,
+ g_object_get(gst->priv->stream,
"live", &live,
NULL);
@@ -558,22 +558,22 @@ parole_gst_tick (ParoleGst *gst)
if (gst->priv->tick_id != 0) {
return;
}
- gst->priv->tick_id = g_timeout_add (250, (GSourceFunc) parole_gst_tick_timeout, gst);
+ gst->priv->tick_id = g_timeout_add(250, (GSourceFunc)parole_gst_tick_timeout, gst);
} else if (gst->priv->tick_id != 0) {
- g_source_remove (gst->priv->tick_id);
+ g_source_remove(gst->priv->tick_id);
gst->priv->tick_id = 0;
}
}
static void
-parole_gst_query_duration (ParoleGst *gst)
+parole_gst_query_duration(ParoleGst *gst)
{
gint64 absolute_duration = 0;
gint64 duration = 0;
gboolean live;
GstFormat gst_time = GST_FORMAT_TIME;
- gst_element_query_duration (gst->priv->playbin,
+ gst_element_query_duration(gst->priv->playbin,
#if GST_CHECK_VERSION(1, 0, 0)
gst_time,
#else
@@ -591,9 +591,9 @@ parole_gst_query_duration (ParoleGst *gst)
duration = absolute_duration / GST_SECOND;
live = (absolute_duration == 0);
- TRACE ("Duration %" G_GINT64_FORMAT ", is_live=%d", duration, live);
+ TRACE("Duration %" G_GINT64_FORMAT ", is_live=%d", duration, live);
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"absolute-duration", absolute_duration,
"duration", duration,
"live", live,
@@ -602,40 +602,40 @@ parole_gst_query_duration (ParoleGst *gst)
}
static void
-parole_gst_set_subtitle_font (ParoleGst *gst)
+parole_gst_set_subtitle_font(ParoleGst *gst)
{
gchar *font;
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"subtitle-font", &font,
NULL);
- TRACE ("Setting subtitle font %s\n", font);
+ TRACE("Setting subtitle font %s\n", font);
- g_object_set (G_OBJECT (gst->priv->playbin),
+ g_object_set(G_OBJECT(gst->priv->playbin),
"subtitle-font-desc", font,
NULL);
- g_free (font);
+ g_free(font);
}
static void
-parole_gst_set_subtitle_encoding (ParoleGst *gst)
+parole_gst_set_subtitle_encoding(ParoleGst *gst)
{
gchar *encoding;
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"subtitle-encoding", &encoding,
NULL);
- g_object_set (G_OBJECT (gst->priv->playbin),
+ g_object_set(G_OBJECT(gst->priv->playbin),
"subtitle-encoding", encoding,
NULL);
- g_free (encoding);
+ g_free(encoding);
}
static void
-parole_gst_load_subtitle (ParoleGst *gst)
+parole_gst_load_subtitle(ParoleGst *gst)
{
ParoleMediaType type;
gchar *uri;
@@ -643,44 +643,44 @@ parole_gst_load_subtitle (ParoleGst *gst)
gchar *sub_uri;
gboolean sub_enabled;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"media-type", &type,
NULL);
if ( type != PAROLE_MEDIA_TYPE_LOCAL_FILE)
return;
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"enable-subtitle", &sub_enabled,
NULL);
if ( !sub_enabled )
return;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"uri", &uri,
"subtitles", &sub,
NULL);
if ( sub )
{
- TRACE ("Found subtitle with path %s", sub);
- sub_uri = g_filename_to_uri (sub, NULL, NULL);
- g_object_set (G_OBJECT (gst->priv->playbin),
+ TRACE("Found subtitle with path %s", sub);
+ sub_uri = g_filename_to_uri(sub, NULL, NULL);
+ g_object_set(G_OBJECT(gst->priv->playbin),
"suburi", sub_uri,
NULL);
- g_free (sub);
- g_free (sub_uri);
+ g_free(sub);
+ g_free(sub_uri);
}
- g_free (uri);
+ g_free(uri);
}
static void
-parole_gst_get_pad_capabilities (GObject *object, GParamSpec *pspec, ParoleGst *gst)
+parole_gst_get_pad_capabilities(GObject *object, GParamSpec *pspec, ParoleGst *gst)
{
GstPad *pad;
GstStructure *st;
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
gint width;
gint height;
guint num;
@@ -690,66 +690,66 @@ parole_gst_get_pad_capabilities (GObject *object, GParamSpec *pspec, ParoleGst *
GstCaps *caps;
#endif
- pad = GST_PAD (object);
+ pad = GST_PAD(object);
if ( !GST_IS_PAD (pad) )
return;
#if GST_CHECK_VERSION(1, 0, 0)
- caps = gst_pad_get_current_caps (pad);
+ caps = gst_pad_get_current_caps(pad);
if ( !caps )
return;
- st = gst_caps_get_structure (caps, 0);
+ st = gst_caps_get_structure(caps, 0);
#else
if ( !GST_IS_PAD (pad) || !GST_PAD_CAPS (pad) )
return;
- st = gst_caps_get_structure (GST_PAD_CAPS (pad), 0);
+ st = gst_caps_get_structure(GST_PAD_CAPS(pad), 0);
#endif
if ( st )
{
- gst_structure_get_int (st, "width", &width);
- gst_structure_get_int (st, "height", &height);
- TRACE ("Caps width=%d height=%d\n", width, height);
+ gst_structure_get_int(st, "width", &width);
+ gst_structure_get_int(st, "height", &height);
+ TRACE("Caps width=%d height=%d\n", width, height);
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"video-width", width,
"video-height", height,
NULL);
if ( ( value = gst_structure_get_value (st, "pixel-aspect-ratio")) )
{
- num = (guint) gst_value_get_fraction_numerator (value),
- den = (guint) gst_value_get_fraction_denominator (value);
- g_object_set (G_OBJECT (gst->priv->stream),
+ num =(guint) gst_value_get_fraction_numerator(value),
+ den =(guint) gst_value_get_fraction_denominator(value);
+ g_object_set(G_OBJECT(gst->priv->stream),
"disp-par-n", num,
"disp-par-d", den,
NULL);
}
- gtk_widget_get_allocation(GTK_WIDGET (gst), allocation);
- parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
+ gtk_widget_get_allocation(GTK_WIDGET(gst), allocation);
+ parole_gst_size_allocate(GTK_WIDGET(gst), allocation);
g_free(allocation);
}
#if GST_CHECK_VERSION(1, 0, 0)
- gst_caps_unref (caps);
+ gst_caps_unref(caps);
#endif
}
static void
-parole_gst_query_info (ParoleGst *gst)
+parole_gst_query_info(ParoleGst *gst)
{
GstPad *videopad = NULL;
gint n_audio, n_video, i;
- g_object_get (G_OBJECT (gst->priv->playbin),
+ g_object_get(G_OBJECT(gst->priv->playbin),
"n-audio", &n_audio,
"n-video", &n_video,
NULL);
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"has-video", (n_video > 0),
"has-audio", (n_audio > 0),
NULL);
@@ -757,7 +757,7 @@ parole_gst_query_info (ParoleGst *gst)
if (n_video > 0)
{
for (i = 0; i < n_video && videopad == NULL; i++)
- g_signal_emit_by_name (gst->priv->playbin, "get-video-pad", i, &videopad);
+ g_signal_emit_by_name(gst->priv->playbin, "get-video-pad", i, &videopad);
if (videopad)
{
@@ -769,44 +769,44 @@ parole_gst_query_info (ParoleGst *gst)
if ((caps = gst_pad_get_negotiated_caps (videopad)))
#endif
{
- parole_gst_get_pad_capabilities (G_OBJECT (videopad), NULL, gst);
- gst_caps_unref (caps);
+ parole_gst_get_pad_capabilities(G_OBJECT(videopad), NULL, gst);
+ gst_caps_unref(caps);
}
- g_signal_connect (videopad, "notify::caps",
- G_CALLBACK (parole_gst_get_pad_capabilities),
+ g_signal_connect(videopad, "notify::caps",
+ G_CALLBACK(parole_gst_get_pad_capabilities),
gst);
- g_object_unref (videopad);
+ g_object_unref(videopad);
}
}
if ( n_video == 0 )
- gtk_widget_queue_draw (GTK_WIDGET (gst));
+ gtk_widget_queue_draw(GTK_WIDGET(gst));
}
static void
-parole_gst_update_stream_info (ParoleGst *gst)
+parole_gst_update_stream_info(ParoleGst *gst)
{
- TRACE ("Updating stream info");
- parole_gst_query_info (gst);
+ TRACE("Updating stream info");
+ parole_gst_query_info(gst);
}
static void
-parole_gst_update_vis (ParoleGst *gst)
+parole_gst_update_vis(ParoleGst *gst)
{
gchar *vis_name;
gint flags;
- TRACE ("start");
+ TRACE("start");
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"vis-enabled", &gst->priv->with_vis,
"vis-name", &vis_name,
NULL);
- TRACE ("Vis name %s enabled %d\n", vis_name, gst->priv->with_vis);
+ TRACE("Vis name %s enabled %d\n", vis_name, gst->priv->with_vis);
- g_object_get (G_OBJECT (gst->priv->playbin),
+ g_object_get(G_OBJECT(gst->priv->playbin),
"flags", &flags,
NULL);
@@ -814,10 +814,10 @@ parole_gst_update_vis (ParoleGst *gst)
GstElement *vis_sink;
flags |= GST_PLAY_FLAG_VIS;
- vis_sink = gst_element_factory_make (vis_name, "vis");
+ vis_sink = gst_element_factory_make(vis_name, "vis");
if (vis_sink) {
- g_object_set (G_OBJECT (gst->priv->playbin),
+ g_object_set(G_OBJECT(gst->priv->playbin),
"vis-plugin", vis_sink,
NULL);
@@ -825,40 +825,40 @@ parole_gst_update_vis (ParoleGst *gst)
}
} else {
flags &= ~GST_PLAY_FLAG_VIS;
- g_object_set (G_OBJECT (gst->priv->playbin),
+ g_object_set(G_OBJECT(gst->priv->playbin),
"vis-plugin", NULL,
NULL);
- gtk_widget_queue_draw (GTK_WIDGET (gst));
+ gtk_widget_queue_draw(GTK_WIDGET(gst));
gst->priv->vis_loaded = FALSE;
}
- g_object_set (G_OBJECT (gst->priv->playbin),
+ g_object_set(G_OBJECT(gst->priv->playbin),
"flags", flags,
NULL);
gst->priv->update_vis = FALSE;
- g_free (vis_name);
- gtk_widget_queue_draw (GTK_WIDGET (gst));
- TRACE ("end");
+ g_free(vis_name);
+ gtk_widget_queue_draw(GTK_WIDGET(gst));
+ TRACE("end");
}
static void
parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState pending)
{
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
TRACE ("State change new %i old %i pending %i", new, old, pending);
gst->priv->state = new;
- parole_gst_tick (gst);
+ parole_gst_tick(gst);
if ( gst->priv->target == new )
{
- gtk_widget_queue_draw (GTK_WIDGET (gst));
- parole_window_normal_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ gtk_widget_queue_draw(GTK_WIDGET(gst));
+ parole_window_normal_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
if ( gst->priv->state_change_id != 0 )
{
- g_source_remove (gst->priv->state_change_id);
+ g_source_remove(gst->priv->state_change_id);
gst->priv->state_change_id = 0;
}
}
@@ -868,11 +868,11 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
case GST_STATE_PLAYING:
{
gst->priv->media_state = PAROLE_STATE_PLAYING;
- TRACE ("Playing");
- parole_gst_query_capabilities (gst);
- parole_gst_query_info (gst);
- parole_gst_query_duration (gst);
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_STATE], 0,
+ TRACE("Playing");
+ parole_gst_query_capabilities(gst);
+ parole_gst_query_info(gst);
+ parole_gst_query_duration(gst);
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_STATE], 0,
gst->priv->stream, PAROLE_STATE_PLAYING);
break;
}
@@ -882,12 +882,12 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
{
if ( gst->priv->update_color_balance )
{
- parole_gst_set_video_color_balance (gst);
+ parole_gst_set_video_color_balance(gst);
}
}
gst->priv->media_state = PAROLE_STATE_PAUSED;
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_STATE], 0,
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_STATE], 0,
gst->priv->stream, PAROLE_STATE_PAUSED);
break;
}
@@ -896,16 +896,16 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
gst->priv->buffering = FALSE;
gst->priv->seeking = FALSE;
gst->priv->media_state = PAROLE_STATE_STOPPED;
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_STATE], 0,
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_STATE], 0,
gst->priv->stream, PAROLE_STATE_STOPPED);
if (gst->priv->target == GST_STATE_PLAYING && pending < GST_STATE_PAUSED) {
- parole_gst_play_file_internal (gst);
+ parole_gst_play_file_internal(gst);
} else if (gst->priv->target == GST_STATE_PAUSED) {
- parole_gst_change_state (gst, GST_STATE_PAUSED);
+ parole_gst_change_state(gst, GST_STATE_PAUSED);
} else if (gst->priv->target == GST_STATE_READY) {
- gtk_widget_get_allocation(GTK_WIDGET (gst), allocation);
- parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
+ gtk_widget_get_allocation(GTK_WIDGET(gst), allocation);
+ parole_gst_size_allocate(GTK_WIDGET(gst), allocation);
g_free(allocation);
}
break;
@@ -915,7 +915,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
gst->priv->buffering = FALSE;
gst->priv->seeking = FALSE;
gst->priv->media_state = PAROLE_STATE_STOPPED;
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_STATE], 0,
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_STATE], 0,
gst->priv->stream, PAROLE_STATE_STOPPED);
break;
}
@@ -925,7 +925,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
}
static void
-parole_gst_element_message_sync (GstBus *bus, GstMessage *message, ParoleGst *gst)
+parole_gst_element_message_sync(GstBus *bus, GstMessage *message, ParoleGst *gst)
{
#if GST_CHECK_VERSION(1, 0, 0)
if ( gst_message_has_name (message, "prepare-window-handle") )
@@ -935,7 +935,7 @@ parole_gst_element_message_sync (GstBus *bus, GstMessage *message, ParoleGst *gs
if ( gst_structure_has_name (message->structure, "prepare-xwindow-id") )
#endif
- parole_gst_set_video_overlay (gst);
+ parole_gst_set_video_overlay(gst);
#if GST_CHECK_VERSION (1, 0, 0)
#else
@@ -945,7 +945,7 @@ out:
}
static GdkPixbuf *
-parole_gst_buffer_to_pixbuf (GstBuffer *buffer)
+parole_gst_buffer_to_pixbuf(GstBuffer *buffer)
{
GdkPixbufLoader *loader;
GdkPixbuf *pixbuf = NULL;
@@ -957,33 +957,33 @@ parole_gst_buffer_to_pixbuf (GstBuffer *buffer)
return NULL;
#endif
- loader = gdk_pixbuf_loader_new ();
+ loader = gdk_pixbuf_loader_new();
#if GST_CHECK_VERSION (1, 0, 0)
if (gdk_pixbuf_loader_write (loader, map.data, map.size, &err) &&
#else
if (gdk_pixbuf_loader_write (loader, buffer->data, buffer->size, &err) &&
#endif
- gdk_pixbuf_loader_close (loader, &err))
+ gdk_pixbuf_loader_close(loader, &err))
{
- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
if (pixbuf) {
- g_object_ref (pixbuf);
+ g_object_ref(pixbuf);
}
} else {
GST_WARNING("could not convert tag image to pixbuf: %s", err->message);
- g_error_free (err);
+ g_error_free(err);
}
#if GST_CHECK_VERSION (1, 0, 0)
- gst_buffer_unmap (buffer, &map);
+ gst_buffer_unmap(buffer, &map);
#endif
- g_object_unref (loader);
+ g_object_unref(loader);
return pixbuf;
}
GdkPixbuf *
-parole_gst_tag_list_get_cover_external (ParoleGst *gst)
+parole_gst_tag_list_get_cover_external(ParoleGst *gst)
{
GdkPixbuf *pixbuf;
GError *err = NULL;
@@ -997,7 +997,7 @@ parole_gst_tag_list_get_cover_external (ParoleGst *gst)
gchar *cover = NULL;
gchar *cover_filename = NULL;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"uri", &uri,
NULL);
@@ -1012,7 +1012,7 @@ parole_gst_tag_list_get_cover_external (ParoleGst *gst)
file_dir = g_dir_open(directory, 0, &error);
if (error)
{
- g_error_free (error);
+ g_error_free(error);
return NULL;
}
@@ -1057,7 +1057,7 @@ parole_gst_tag_list_get_cover_external (ParoleGst *gst)
}
GdkPixbuf *
-parole_gst_tag_list_get_cover_embedded (ParoleGst *gst, GstTagList *tag_list)
+parole_gst_tag_list_get_cover_embedded(ParoleGst *gst, GstTagList *tag_list)
{
GdkPixbuf *pixbuf;
const GValue *cover_value = NULL;
@@ -1073,21 +1073,21 @@ parole_gst_tag_list_get_cover_embedded (ParoleGst *gst, GstTagList *tag_list)
GstStructure *caps_struct;
int type;
- value = gst_tag_list_get_value_index (tag_list,
+ value = gst_tag_list_get_value_index(tag_list,
GST_TAG_IMAGE,
i);
if (value == NULL)
break;
#if GST_CHECK_VERSION(1, 0, 0)
- sample = gst_value_get_sample (value);
- caps_struct = gst_caps_get_structure (gst_sample_get_caps(sample), 0);
+ sample = gst_value_get_sample(value);
+ caps_struct = gst_caps_get_structure(gst_sample_get_caps(sample), 0);
#else
- buffer = gst_value_get_buffer (value);
- caps_struct = gst_caps_get_structure (buffer->caps, 0);
+ buffer = gst_value_get_buffer(value);
+ caps_struct = gst_caps_get_structure(buffer->caps, 0);
#endif
- gst_structure_get_enum (caps_struct,
+ gst_structure_get_enum(caps_struct,
"image-type",
GST_TYPE_TAG_IMAGE_TYPE,
&type);
@@ -1101,7 +1101,7 @@ parole_gst_tag_list_get_cover_embedded (ParoleGst *gst, GstTagList *tag_list)
}
if (!cover_value) {
- cover_value = gst_tag_list_get_value_index (tag_list,
+ cover_value = gst_tag_list_get_value_index(tag_list,
GST_TAG_PREVIEW_IMAGE,
0);
}
@@ -1109,12 +1109,12 @@ parole_gst_tag_list_get_cover_embedded (ParoleGst *gst, GstTagList *tag_list)
if (cover_value) {
#if GST_CHECK_VERSION(1, 0, 0)
GstSample *sample;
- sample = gst_value_get_sample (cover_value);
- pixbuf = parole_gst_buffer_to_pixbuf (gst_sample_get_buffer (sample));
+ sample = gst_value_get_sample(cover_value);
+ pixbuf = parole_gst_buffer_to_pixbuf(gst_sample_get_buffer(sample));
#else
GstBuffer *buffer;
- buffer = gst_value_get_buffer (cover_value);
- pixbuf = parole_gst_buffer_to_pixbuf (buffer);
+ buffer = gst_value_get_buffer(cover_value);
+ pixbuf = parole_gst_buffer_to_pixbuf(buffer);
#endif
return pixbuf;
}
@@ -1122,14 +1122,14 @@ parole_gst_tag_list_get_cover_embedded (ParoleGst *gst, GstTagList *tag_list)
}
GdkPixbuf *
-parole_gst_tag_list_get_cover (ParoleGst *gst, GstTagList *tag_list)
+parole_gst_tag_list_get_cover(ParoleGst *gst, GstTagList *tag_list)
{
GdkPixbuf *pixbuf;
GdkPixbuf *scaled;
gint height, width;
gfloat multiplier;
- g_return_val_if_fail (tag_list != NULL, FALSE);
+ g_return_val_if_fail(tag_list != NULL, FALSE);
pixbuf = parole_gst_tag_list_get_cover_external(gst);
if (!pixbuf)
@@ -1152,7 +1152,7 @@ parole_gst_tag_list_get_cover (ParoleGst *gst, GstTagList *tag_list)
width = 256;
}
- scaled = gdk_pixbuf_scale_simple (pixbuf,
+ scaled = gdk_pixbuf_scale_simple(pixbuf,
width,
height,
GDK_INTERP_HYPER);
@@ -1162,7 +1162,7 @@ parole_gst_tag_list_get_cover (ParoleGst *gst, GstTagList *tag_list)
}
static void
-parole_gst_get_meta_data_dvd (ParoleGst *gst)
+parole_gst_get_meta_data_dvd(ParoleGst *gst)
{
gint n_chapters;
guint num_chapters = 1;
@@ -1171,32 +1171,32 @@ parole_gst_get_meta_data_dvd (ParoleGst *gst)
guint current_chapter;
gint64 val = -1;
- GstFormat format = gst_format_get_by_nick ("chapter");
+ GstFormat format = gst_format_get_by_nick("chapter");
TRACE("START");
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"num-tracks", ¤t_num_chapters,
"track", ¤t_chapter,
NULL);
/* Get the number of chapters for the current title. */
#if GST_CHECK_VERSION(1, 0, 0)
- if (gst_element_query_duration (gst->priv->playbin, format, &val)) {
+ if (gst_element_query_duration(gst->priv->playbin, format, &val)) {
#else
- if (gst_element_query_duration (gst->priv->playbin, &format, &val)) {
+ if (gst_element_query_duration(gst->priv->playbin, &format, &val)) {
#endif
n_chapters = (gint) val;
num_chapters = (guint) n_chapters;
TRACE("Number of chapters: %i", n_chapters);
if (num_chapters != current_num_chapters)
{
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"num-tracks", num_chapters,
NULL);
TRACE("Updated DVD chapter count: %i", n_chapters);
- g_signal_emit (G_OBJECT (gst), signals[DVD_CHAPTER_COUNT_CHANGE], 0,
+ g_signal_emit(G_OBJECT(gst), signals[DVD_CHAPTER_COUNT_CHANGE], 0,
n_chapters);
}
}
@@ -1204,21 +1204,21 @@ parole_gst_get_meta_data_dvd (ParoleGst *gst)
/* Get the current chapter. */
val = -1;
#if GST_CHECK_VERSION(1, 0, 0)
- if (gst_element_query_position (gst->priv->playbin, format, &val)) {
+ if (gst_element_query_position(gst->priv->playbin, format, &val)) {
#else
- if (gst_element_query_position (gst->priv->playbin, &format, &val)) {
+ if (gst_element_query_position(gst->priv->playbin, &format, &val)) {
#endif
chapter = (guint)(gint) val;
TRACE("Current chapter: %i", chapter);
if ( chapter != current_chapter || num_chapters != 1 )
{
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"track", chapter,
NULL);
TRACE("Updated current DVD chapter: %i", chapter);
if (current_chapter != 1)
- g_signal_emit (G_OBJECT (gst), signals[DVD_CHAPTER_CHANGE], 0,
+ g_signal_emit(G_OBJECT(gst), signals[DVD_CHAPTER_CHANGE], 0,
chapter);
}
}
@@ -1226,15 +1226,15 @@ parole_gst_get_meta_data_dvd (ParoleGst *gst)
static void
-parole_gst_get_meta_data_cdda (ParoleGst *gst, GstTagList *tag)
+parole_gst_get_meta_data_cdda(ParoleGst *gst, GstTagList *tag)
{
guint num_tracks;
guint track;
if (gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, &track) &&
- gst_tag_list_get_uint (tag, GST_TAG_TRACK_COUNT, &num_tracks))
+ gst_tag_list_get_uint(tag, GST_TAG_TRACK_COUNT, &num_tracks))
{
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"num-tracks", num_tracks,
"track", track,
"title", g_strdup_printf(_("Track %i"), track),
@@ -1245,18 +1245,18 @@ parole_gst_get_meta_data_cdda (ParoleGst *gst, GstTagList *tag)
"genre", NULL,
NULL);
- parole_stream_set_image (G_OBJECT (gst->priv->stream), NULL);
- g_object_set (G_OBJECT (gst->priv->stream),
+ parole_stream_set_image(G_OBJECT(gst->priv->stream), NULL);
+ g_object_set(G_OBJECT(gst->priv->stream),
"tag-available", FALSE,
NULL);
- TRACE ("num_tracks=%i track=%i", num_tracks, track);
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_TAG], 0, gst->priv->stream);
+ TRACE("num_tracks=%i track=%i", num_tracks, track);
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_TAG], 0, gst->priv->stream);
}
}
static void
-parole_gst_get_meta_data_file (ParoleGst *gst, GstTagList *tag)
+parole_gst_get_meta_data_file(ParoleGst *gst, GstTagList *tag)
{
gchar *str;
GDate *date;
@@ -1266,67 +1266,67 @@ parole_gst_get_meta_data_file (ParoleGst *gst, GstTagList *tag)
if ( gst_tag_list_get_string_index (tag, GST_TAG_TITLE, 0, &str) )
{
- TRACE ("title:%s", str);
- g_object_set (G_OBJECT (gst->priv->stream),
+ TRACE("title:%s", str);
+ g_object_set(G_OBJECT(gst->priv->stream),
"title", str,
NULL);
- g_free (str);
+ g_free(str);
}
if ( gst_tag_list_get_string_index (tag, GST_TAG_ARTIST, 0, &str) )
{
- TRACE ("artist:%s", str);
- g_object_set (G_OBJECT (gst->priv->stream),
+ TRACE("artist:%s", str);
+ g_object_set(G_OBJECT(gst->priv->stream),
"artist", str,
NULL);
- g_free (str);
+ g_free(str);
}
if ( gst_tag_list_get_date (tag, GST_TAG_DATE, &date) )
{
- str = g_strdup_printf ("%d", g_date_get_year (date));
- TRACE ("year:%s", str);
+ str = g_strdup_printf("%d", g_date_get_year(date));
+ TRACE("year:%s", str);
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"year", str,
NULL);
- g_date_free (date);
- g_free (str);
+ g_date_free(date);
+ g_free(str);
}
if ( gst_tag_list_get_string_index (tag, GST_TAG_ALBUM, 0, &str) )
{
- TRACE ("album:%s", str);
- g_object_set (G_OBJECT (gst->priv->stream),
+ TRACE("album:%s", str);
+ g_object_set(G_OBJECT(gst->priv->stream),
"album", str,
NULL);
- g_free (str);
+ g_free(str);
}
if ( gst_tag_list_get_string_index (tag, GST_TAG_COMMENT, 0, &str) )
{
- TRACE ("comment:%s", str);
- g_object_set (G_OBJECT (gst->priv->stream),
+ TRACE("comment:%s", str);
+ g_object_set(G_OBJECT(gst->priv->stream),
"comment", str,
NULL);
- g_free (str);
+ g_free(str);
}
if ( gst_tag_list_get_string_index (tag, GST_TAG_GENRE, 0, &str) )
{
- TRACE ("genre:%s", str);
- g_object_set (G_OBJECT (gst->priv->stream),
+ TRACE("genre:%s", str);
+ g_object_set(G_OBJECT(gst->priv->stream),
"genre", str,
NULL);
- g_free (str);
+ g_free(str);
}
if ( gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, &integer) )
{
- TRACE ("track:%i", integer);
+ TRACE("track:%i", integer);
if (integer < 100)
{
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"track", integer,
NULL);
}
@@ -1334,30 +1334,30 @@ parole_gst_get_meta_data_file (ParoleGst *gst, GstTagList *tag)
if ( gst_tag_list_get_uint (tag, GST_TAG_BITRATE, &integer) )
{
- TRACE ("bitrate:%i", integer);
- g_object_set (G_OBJECT (gst->priv->stream),
+ TRACE("bitrate:%i", integer);
+ g_object_set(G_OBJECT(gst->priv->stream),
"bitrate", integer,
NULL);
}
- pixbuf = parole_gst_tag_list_get_cover (gst, tag);
+ pixbuf = parole_gst_tag_list_get_cover(gst, tag);
if (pixbuf)
{
- parole_stream_set_image (G_OBJECT (gst->priv->stream), pixbuf);
- g_object_unref (pixbuf);
+ parole_stream_set_image(G_OBJECT(gst->priv->stream), pixbuf);
+ g_object_unref(pixbuf);
}
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"tag-available", TRUE,
NULL);
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_TAG], 0, gst->priv->stream);
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_TAG], 0, gst->priv->stream);
}
static void
-parole_gst_get_meta_data_unknown (ParoleGst *gst)
+parole_gst_get_meta_data_unknown(ParoleGst *gst)
{
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"title", NULL,
"artist", NULL,
"year", NULL,
@@ -1366,21 +1366,21 @@ parole_gst_get_meta_data_unknown (ParoleGst *gst)
"genre", NULL,
NULL);
- parole_stream_set_image (G_OBJECT (gst->priv->stream), NULL);
+ parole_stream_set_image(G_OBJECT(gst->priv->stream), NULL);
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"tag-available", FALSE,
NULL);
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_TAG], 0, gst->priv->stream);
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_TAG], 0, gst->priv->stream);
}
static void
-parole_gst_get_meta_data (ParoleGst *gst, GstTagList *tag)
+parole_gst_get_meta_data(ParoleGst *gst, GstTagList *tag)
{
ParoleMediaType media_type;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"media-type", &media_type,
NULL);
@@ -1388,16 +1388,16 @@ parole_gst_get_meta_data (ParoleGst *gst, GstTagList *tag)
{
case PAROLE_MEDIA_TYPE_LOCAL_FILE:
case PAROLE_MEDIA_TYPE_REMOTE:
- parole_gst_get_meta_data_file (gst, tag);
+ parole_gst_get_meta_data_file(gst, tag);
break;
case PAROLE_MEDIA_TYPE_CDDA:
- parole_gst_get_meta_data_cdda (gst, tag);
+ parole_gst_get_meta_data_cdda(gst, tag);
break;
case PAROLE_MEDIA_TYPE_DVD:
- parole_gst_get_meta_data_dvd (gst);
+ parole_gst_get_meta_data_dvd(gst);
break;
case PAROLE_MEDIA_TYPE_UNKNOWN:
- parole_gst_get_meta_data_unknown (gst);
+ parole_gst_get_meta_data_unknown(gst);
break;
default:
break;
@@ -1405,29 +1405,29 @@ parole_gst_get_meta_data (ParoleGst *gst, GstTagList *tag)
}
static void
-parole_gst_application_message (ParoleGst *gst, GstMessage *msg)
+parole_gst_application_message(ParoleGst *gst, GstMessage *msg)
{
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
#if GST_CHECK_VERSION(1, 0, 0)
- if (gst_message_has_name (msg, "notify-streaminfo")) {
+ if (gst_message_has_name(msg, "notify-streaminfo")) {
#else
const gchar *name;
- name = gst_structure_get_name (msg->structure);
+ name = gst_structure_get_name(msg->structure);
if ( !name )
return;
- if (!g_strcmp0 (name, "notify-streaminfo")) {
+ if (!g_strcmp0(name, "notify-streaminfo")) {
#endif
- parole_gst_update_stream_info (gst);
+ parole_gst_update_stream_info(gst);
#if GST_CHECK_VERSION(1, 0, 0)
- } else if (gst_message_has_name (msg, "video-size")) {
+ } else if (gst_message_has_name(msg, "video-size")) {
#else
- } else if (!g_strcmp0 (name, "video-size")) {
+ } else if (!g_strcmp0(name, "video-size")) {
#endif
- gtk_widget_get_allocation(GTK_WIDGET (gst), allocation);
- parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
+ gtk_widget_get_allocation(GTK_WIDGET(gst), allocation);
+ parole_gst_size_allocate(GTK_WIDGET(gst), allocation);
g_free(allocation);
}
}
@@ -1446,18 +1446,18 @@ parole_gst_install_plugins_result_func(GstInstallPluginsReturn result, gpointer
switch (result)
{
case GST_INSTALL_PLUGINS_SUCCESS:
- g_debug ("Finished plugin install.\n");
+ g_debug("Finished plugin install.\n");
gst_update_registry();
parole_gst_resume(PAROLE_GST(user_data));
break;
case GST_INSTALL_PLUGINS_NOT_FOUND:
- g_debug ("An appropriate installation candidate could not be found.\n");
+ g_debug("An appropriate installation candidate could not be found.\n");
break;
case GST_INSTALL_PLUGINS_USER_ABORT:
- g_debug ("User aborted plugin install.\n");
+ g_debug("User aborted plugin install.\n");
break;
default:
- g_debug ("Plugin installation failed with code %i\n", result);
+ g_debug("Plugin installation failed with code %i\n", result);
break;
}
}
@@ -1507,7 +1507,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg)
}
static gboolean
-parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
+parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
{
ParoleGst *gst;
GtkDialog *dialog;
@@ -1515,7 +1515,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
GstInstallPluginsContext *ctx;
gint response;
- gst = PAROLE_GST (data);
+ gst = PAROLE_GST(data);
switch (GST_MESSAGE_TYPE (msg))
{
@@ -1523,14 +1523,14 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
{
ParoleMediaType media_type;
- TRACE ("End of stream");
+ TRACE("End of stream");
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"media-type", &media_type,
NULL);
gst->priv->media_state = PAROLE_STATE_PLAYBACK_FINISHED;
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_STATE], 0,
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_STATE], 0,
gst->priv->stream, PAROLE_STATE_PLAYBACK_FINISHED);
break;
}
@@ -1538,24 +1538,24 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
{
GError *error = NULL;
gchar *debug;
- parole_window_normal_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ parole_window_normal_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
gst->priv->target = GST_STATE_NULL;
gst->priv->buffering = FALSE;
- parole_gst_change_state (gst, GST_STATE_NULL);
- gst_message_parse_error (msg, &error, &debug);
- TRACE ("*** ERROR %s : %s ***", error->message, debug);
- g_signal_emit (G_OBJECT (gst), signals[ERROR], 0, error->message);
- g_error_free (error);
- g_free (debug);
- gtk_widget_queue_draw (GTK_WIDGET (gst));
+ parole_gst_change_state(gst, GST_STATE_NULL);
+ gst_message_parse_error(msg, &error, &debug);
+ TRACE("*** ERROR %s : %s ***", error->message, debug);
+ g_signal_emit(G_OBJECT(gst), signals[ERROR], 0, error->message);
+ g_error_free(error);
+ g_free(debug);
+ gtk_widget_queue_draw(GTK_WIDGET(gst));
break;
}
case GST_MESSAGE_BUFFERING:
{
gint per = 0;
- gst_message_parse_buffering (msg, &per);
- TRACE ("Buffering %d %%", per);
- g_signal_emit (G_OBJECT (gst), signals[BUFFERING], 0,
+ gst_message_parse_buffering(msg, &per);
+ TRACE("Buffering %d %%", per);
+ g_signal_emit(G_OBJECT(gst), signals[BUFFERING], 0,
gst->priv->stream, per);
gst->priv->buffering = per != 100;
@@ -1577,21 +1577,21 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
if ( gst->priv->enable_tags )
{
GstTagList *tag_list;
- TRACE ("Tag message:");
- gst_message_parse_tag (msg, &tag_list);
- parole_gst_get_meta_data (gst, tag_list);
- gst_tag_list_free (tag_list);
+ TRACE("Tag message:");
+ gst_message_parse_tag(msg, &tag_list);
+ parole_gst_get_meta_data(gst, tag_list);
+ gst_tag_list_free(tag_list);
}
break;
}
case GST_MESSAGE_APPLICATION:
- parole_gst_application_message (gst, msg);
+ parole_gst_application_message(gst, msg);
break;
case GST_MESSAGE_DURATION:
if (gst->priv->state == GST_STATE_PLAYING)
{
- TRACE ("Duration message");
- parole_gst_query_duration (gst);
+ TRACE("Duration message");
+ parole_gst_query_duration(gst);
}
break;
case GST_MESSAGE_ELEMENT:
@@ -1610,10 +1610,10 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
#ifdef GDK_WINDOWING_X11
if (gtk_widget_get_window (GTK_WIDGET (gst)) != NULL &&
- gtk_widget_get_realized (GTK_WIDGET (gst)))
+ gtk_widget_get_realized(GTK_WIDGET(gst)))
{
- gst_install_plugins_context_set_xid (ctx,
- gdk_x11_window_get_xid (gtk_widget_get_window(GTK_WIDGET (gst))));
+ gst_install_plugins_context_set_xid(ctx,
+ gdk_x11_window_get_xid(gtk_widget_get_window(GTK_WIDGET(gst))));
}
#endif /* GDK_WINDOWING_X11 */
@@ -1629,19 +1629,19 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
}
break;
case GST_MESSAGE_INFO:
- TRACE ("Info message:");
+ TRACE("Info message:");
break;
case GST_MESSAGE_STATE_DIRTY:
- TRACE ("Stream is dirty");
+ TRACE("Stream is dirty");
break;
case GST_MESSAGE_STREAM_STATUS:
- TRACE ("Stream status");
+ TRACE("Stream status");
break;
case GST_MESSAGE_ASYNC_DONE:
if (gst->priv->seeking)
{
gst->priv->seeking = FALSE;
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_SEEKED], 0);
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_SEEKED], 0);
}
break;
case GST_MESSAGE_WARNING:
@@ -1671,19 +1671,19 @@ parole_gst_change_state (ParoleGst *gst, GstState new)
switch (ret)
{
case GST_STATE_CHANGE_SUCCESS:
- parole_gst_evaluate_state (gst,
- GST_STATE_RETURN (gst->priv->playbin),
- GST_STATE (gst->priv->playbin),
- GST_STATE_PENDING (gst->priv->playbin));
+ parole_gst_evaluate_state(gst,
+ GST_STATE_RETURN(gst->priv->playbin),
+ GST_STATE(gst->priv->playbin),
+ GST_STATE_PENDING(gst->priv->playbin));
break;
case GST_STATE_CHANGE_ASYNC:
- TRACE ("State will change async");
+ TRACE("State will change async");
break;
case GST_STATE_CHANGE_FAILURE:
- TRACE ("Error will be handled async");
+ TRACE("Error will be handled async");
break;
case GST_STATE_CHANGE_NO_PREROLL:
- TRACE ("State change no_preroll");
+ TRACE("State change no_preroll");
break;
default:
break;
@@ -1691,11 +1691,11 @@ parole_gst_change_state (ParoleGst *gst, GstState new)
}
static void
-parole_gst_source_notify_cb (GObject *obj, GParamSpec *pspec, ParoleGst *gst)
+parole_gst_source_notify_cb(GObject *obj, GParamSpec *pspec, ParoleGst *gst)
{
GObject *source;
- g_object_get (obj,
+ g_object_get(obj,
"source", &source,
NULL);
@@ -1703,73 +1703,73 @@ parole_gst_source_notify_cb (GObject *obj, GParamSpec *pspec, ParoleGst *gst)
{
if ( G_LIKELY (gst->priv->device) )
{
- g_object_set (source,
+ g_object_set(source,
"device", gst->priv->device,
NULL);
}
- g_object_unref (source);
+ g_object_unref(source);
}
}
static void
-parole_gst_play_file_internal (ParoleGst *gst)
+parole_gst_play_file_internal(ParoleGst *gst)
{
gchar *uri;
- TRACE ("Start");
+ TRACE("Start");
if ( G_UNLIKELY (GST_STATE (gst->priv->playbin) == GST_STATE_PLAYING ) )
{
- TRACE ("*** Error *** This is a bug, playbin element is already playing");
+ TRACE("*** Error *** This is a bug, playbin element is already playing");
}
if ( gst->priv->update_vis)
- parole_gst_update_vis (gst);
+ parole_gst_update_vis(gst);
- parole_stream_set_image (G_OBJECT (gst->priv->stream), NULL);
+ parole_stream_set_image(G_OBJECT(gst->priv->stream), NULL);
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"uri", &uri,
NULL);
- TRACE ("Processing uri : %s", uri);
+ TRACE("Processing uri : %s", uri);
- g_object_set (G_OBJECT (gst->priv->playbin),
+ g_object_set(G_OBJECT(gst->priv->playbin),
"uri", uri,
"suburi", NULL,
NULL);
- parole_gst_load_subtitle (gst);
- parole_gst_change_state (gst, GST_STATE_PLAYING);
- g_free (uri);
+ parole_gst_load_subtitle(gst);
+ parole_gst_change_state(gst, GST_STATE_PLAYING);
+ g_free(uri);
}
void
parole_gst_send_navigation_command(ParoleGst *gst, gint command)
{
GstNavigation *nav;
- nav = GST_NAVIGATION (gst->priv->video_sink);
+ nav = GST_NAVIGATION(gst->priv->video_sink);
switch (command) {
case GST_DVD_ROOT_MENU:
TRACE("Root Menu");
- gst_navigation_send_command (nav, GST_NAVIGATION_COMMAND_DVD_MENU);
+ gst_navigation_send_command(nav, GST_NAVIGATION_COMMAND_DVD_MENU);
break;
case GST_DVD_TITLE_MENU:
TRACE("Title Menu");
- gst_navigation_send_command (nav, GST_NAVIGATION_COMMAND_DVD_TITLE_MENU);
+ gst_navigation_send_command(nav, GST_NAVIGATION_COMMAND_DVD_TITLE_MENU);
break;
case GST_DVD_AUDIO_MENU:
TRACE("Audio Menu");
- gst_navigation_send_command (nav, GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU);
+ gst_navigation_send_command(nav, GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU);
break;
case GST_DVD_ANGLE_MENU:
TRACE("Angle Menu");
- gst_navigation_send_command (nav, GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU);
+ gst_navigation_send_command(nav, GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU);
break;
case GST_DVD_CHAPTER_MENU:
TRACE("Chapter Menu");
- gst_navigation_send_command (nav, GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU);
+ gst_navigation_send_command(nav, GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU);
break;
default:
break;
@@ -1777,77 +1777,77 @@ parole_gst_send_navigation_command(ParoleGst *gst, gint command)
}
static gboolean
-parole_gst_motion_notify_event (GtkWidget *widget, GdkEventMotion *ev)
+parole_gst_motion_notify_event(GtkWidget *widget, GdkEventMotion *ev)
{
gboolean ret = FALSE;
if (GTK_WIDGET_CLASS (parole_gst_parent_class)->motion_notify_event)
- ret |= GTK_WIDGET_CLASS (parole_gst_parent_class)->motion_notify_event (widget, ev);
+ ret |= GTK_WIDGET_CLASS(parole_gst_parent_class)->motion_notify_event(widget, ev);
return ret;
}
static gboolean
-parole_gst_button_press_event (GtkWidget *widget, GdkEventButton *ev)
+parole_gst_button_press_event(GtkWidget *widget, GdkEventButton *ev)
{
ParoleGst *gst;
GstNavigation *nav;
gboolean playing_video;
gboolean ret = FALSE;
- gst = PAROLE_GST (widget);
+ gst = PAROLE_GST(widget);
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"has-video", &playing_video,
NULL);
if ( gst->priv->state == GST_STATE_PLAYING && playing_video)
{
- nav = GST_NAVIGATION (gst->priv->video_sink);
- gst_navigation_send_mouse_event (nav, "mouse-button-press", ev->button, ev->x, ev->y);
+ nav = GST_NAVIGATION(gst->priv->video_sink);
+ gst_navigation_send_mouse_event(nav, "mouse-button-press", ev->button, ev->x, ev->y);
}
if (GTK_WIDGET_CLASS (parole_gst_parent_class)->button_press_event)
- ret |= GTK_WIDGET_CLASS (parole_gst_parent_class)->button_press_event (widget, ev);
+ ret |= GTK_WIDGET_CLASS(parole_gst_parent_class)->button_press_event(widget, ev);
return ret;
}
static gboolean
-parole_gst_button_release_event (GtkWidget *widget, GdkEventButton *ev)
+parole_gst_button_release_event(GtkWidget *widget, GdkEventButton *ev)
{
ParoleGst *gst;
GstNavigation *nav;
gboolean playing_video;
gboolean ret = FALSE;
- gst = PAROLE_GST (widget);
+ gst = PAROLE_GST(widget);
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"has-video", &playing_video,
NULL);
if ( gst->priv->state == GST_STATE_PLAYING && playing_video)
{
- nav = GST_NAVIGATION (gst->priv->video_sink);
- gst_navigation_send_mouse_event (nav, "mouse-button-release", ev->button, ev->x, ev->y);
+ nav = GST_NAVIGATION(gst->priv->video_sink);
+ gst_navigation_send_mouse_event(nav, "mouse-button-release", ev->button, ev->x, ev->y);
}
if (GTK_WIDGET_CLASS (parole_gst_parent_class)->button_release_event)
- ret |= GTK_WIDGET_CLASS (parole_gst_parent_class)->button_release_event (widget, ev);
+ ret |= GTK_WIDGET_CLASS(parole_gst_parent_class)->button_release_event(widget, ev);
return ret;
}
static void
-parole_gst_seek_by_format (ParoleGst *gst, GstFormat format, gint step)
+parole_gst_seek_by_format(ParoleGst *gst, GstFormat format, gint step)
{
gint64 val = 1;
#if GST_CHECK_VERSION(1, 0, 0)
- if (gst_element_query_position (gst->priv->playbin, format, &val)) {
+ if (gst_element_query_position(gst->priv->playbin, format, &val)) {
#else
- if (gst_element_query_position (gst->priv->playbin, &format, &val)) {
+ if (gst_element_query_position(gst->priv->playbin, &format, &val)) {
#endif
val += step;
if ( !gst_element_seek (gst->priv->playbin, 1.0, format,
@@ -1856,52 +1856,52 @@ parole_gst_seek_by_format (ParoleGst *gst, GstFormat format, gint step)
GST_SEEK_TYPE_NONE,
0) )
{
- g_warning ("Seek failed : %s", gst_format_get_name (format));
+ g_warning("Seek failed : %s", gst_format_get_name(format));
}
} else {
- g_warning ("Failed to query element position: %s", gst_format_get_name (format));
+ g_warning("Failed to query element position: %s", gst_format_get_name(format));
}
}
static void
-parole_gst_change_dvd_chapter (ParoleGst *gst, gint level)
+parole_gst_change_dvd_chapter(ParoleGst *gst, gint level)
{
- GstFormat format = gst_format_get_by_nick ("chapter");
+ GstFormat format = gst_format_get_by_nick("chapter");
- parole_gst_seek_by_format (gst, format, level);
+ parole_gst_seek_by_format(gst, format, level);
}
static void
-parole_gst_change_cdda_track (ParoleGst *gst, gint level)
+parole_gst_change_cdda_track(ParoleGst *gst, gint level)
{
- GstFormat format = gst_format_get_by_nick ("track");
+ GstFormat format = gst_format_get_by_nick("track");
- parole_gst_seek_by_format (gst, format, level);
+ parole_gst_seek_by_format(gst, format, level);
}
-ParoleMediaType parole_gst_get_current_stream_type (ParoleGst *gst)
+ParoleMediaType parole_gst_get_current_stream_type(ParoleGst *gst)
{
ParoleMediaType type;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"media-type", &type,
NULL);
return type;
}
static gboolean
-parole_gst_check_state_change_timeout (gpointer data)
+parole_gst_check_state_change_timeout(gpointer data)
{
ParoleGst *gst;
GtkWidget *dialog;
- gst = PAROLE_GST (data);
+ gst = PAROLE_GST(data);
- TRACE ("target =%d current state=%d", gst->priv->target, gst->priv->state);
+ TRACE("target =%d current state=%d", gst->priv->target, gst->priv->state);
g_print("check state\n");
if ( gst->priv->state != gst->priv->target )
{
- dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))),
+ dialog = gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(gst))),
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
@@ -1911,7 +1911,7 @@ parole_gst_check_state_change_timeout (gpointer data)
gtk_dialog_add_button(GTK_DIALOG(dialog), _("Continue"), GTK_RESPONSE_CLOSE);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_CANCEL)
{
- parole_gst_terminate_internal (gst);
+ parole_gst_terminate_internal(gst);
gst->priv->state_change_id = 0;
return FALSE;
}
@@ -1920,159 +1920,159 @@ parole_gst_check_state_change_timeout (gpointer data)
}
static void
-parole_gst_terminate_internal (ParoleGst *gst)
+parole_gst_terminate_internal(ParoleGst *gst)
{
gboolean playing_video;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"has-video", &playing_video,
NULL);
- g_mutex_lock (&gst->priv->lock);
+ g_mutex_lock(&gst->priv->lock);
gst->priv->target = GST_STATE_NULL;
- parole_stream_init_properties (gst->priv->stream);
- g_mutex_unlock (&gst->priv->lock);
+ parole_stream_init_properties(gst->priv->stream);
+ g_mutex_unlock(&gst->priv->lock);
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
- parole_gst_change_state (gst, GST_STATE_NULL);
+ parole_gst_change_state(gst, GST_STATE_NULL);
}
static void
-parole_gst_about_to_finish_cb (GstElement *elm, gpointer data)
+parole_gst_about_to_finish_cb(GstElement *elm, gpointer data)
{
ParoleGst *gst;
- gst = PAROLE_GST (data);
+ gst = PAROLE_GST(data);
- g_signal_emit (G_OBJECT (gst), signals[MEDIA_STATE], 0,
+ g_signal_emit(G_OBJECT(gst), signals[MEDIA_STATE], 0,
gst->priv->stream, PAROLE_STATE_ABOUT_TO_FINISH);
}
static void
-parole_gst_conf_notify_cb (GObject *object, GParamSpec *spec, ParoleGst *gst)
+parole_gst_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleGst *gst)
{
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
- if ( !g_strcmp0 ("vis-enabled", spec->name) || !g_strcmp0 ("vis-name", spec->name) ) {
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
+ if ( !g_strcmp0("vis-enabled", spec->name) || !g_strcmp0("vis-name", spec->name) ) {
gst->priv->update_vis = TRUE;
} else if (!g_strcmp0("subtitle-font", spec->name) || !g_strcmp0("enable-subtitle", spec->name)) {
- parole_gst_set_subtitle_font (gst);
- } else if (!g_strcmp0 ("subtitle-encoding", spec->name)) {
- parole_gst_set_subtitle_encoding (gst);
+ parole_gst_set_subtitle_font(gst);
+ } else if (!g_strcmp0("subtitle-encoding", spec->name)) {
+ parole_gst_set_subtitle_encoding(gst);
} else if (!g_strcmp0 ("brightness", spec->name) || !g_strcmp0 ("hue", spec->name) ||
- !g_strcmp0 ("contrast", spec->name) || !g_strcmp0 ("saturation", spec->name))
+ !g_strcmp0("contrast", spec->name) || !g_strcmp0("saturation", spec->name))
{
gst->priv->update_color_balance = TRUE;
if ( gst->priv->state >= GST_STATE_PAUSED )
- parole_gst_set_video_color_balance (gst);
- } else if ( !g_strcmp0 ("aspect-ratio", spec->name) ) {
- g_object_get (G_OBJECT (gst->priv->conf),
+ parole_gst_set_video_color_balance(gst);
+ } else if ( !g_strcmp0("aspect-ratio", spec->name) ) {
+ g_object_get(G_OBJECT(gst->priv->conf),
"aspect-ratio", &gst->priv->aspect_ratio,
NULL);
- gtk_widget_get_allocation(GTK_WIDGET (gst), allocation);
- parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
+ gtk_widget_get_allocation(GTK_WIDGET(gst), allocation);
+ parole_gst_size_allocate(GTK_WIDGET(gst), allocation);
g_free(allocation);
}
}
static void
-parole_gst_conf_notify_volume_cb (GObject *conf, GParamSpec *pspec, ParoleGst *gst)
+parole_gst_conf_notify_volume_cb(GObject *conf, GParamSpec *pspec, ParoleGst *gst)
{
gint volume;
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"volume", &volume,
NULL);
parole_gst_set_volume (gst, (double)(volume / 100.0));
}
-static void parole_gst_get_property (GObject *object,
+static void parole_gst_get_property(GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
ParoleGst *gst;
- gst = PAROLE_GST (object);
+ gst = PAROLE_GST(object);
switch (prop_id)
{
case PROP_VOLUME:
- g_value_set_double (value, gst->priv->volume);
+ g_value_set_double(value, gst->priv->volume);
break;
case PROP_CONF_OBJ:
- g_value_set_pointer (value, gst->priv->conf);
+ g_value_set_pointer(value, gst->priv->conf);
break;
case PROP_ENABLE_TAGS:
- g_value_set_boolean (value, gst->priv->enable_tags);
+ g_value_set_boolean(value, gst->priv->enable_tags);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
-static void parole_gst_set_property (GObject *object,
+static void parole_gst_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
ParoleGst *gst;
- gst = PAROLE_GST (object);
+ gst = PAROLE_GST(object);
switch (prop_id)
{
case PROP_ENABLE_TAGS:
- gst->priv->enable_tags = g_value_get_boolean (value);
+ gst->priv->enable_tags = g_value_get_boolean(value);
break;
case PROP_VOLUME:
- parole_gst_set_volume (gst, g_value_get_double (value));
+ parole_gst_set_volume(gst, g_value_get_double(value));
break;
case PROP_CONF_OBJ:
- gst->priv->conf = g_value_get_pointer (value);
+ gst->priv->conf = g_value_get_pointer(value);
if (gst->priv->conf)
{
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"aspect-ratio", &gst->priv->aspect_ratio,
NULL);
- g_signal_connect (G_OBJECT (gst->priv->conf), "notify",
- G_CALLBACK (parole_gst_conf_notify_cb), gst);
- g_signal_connect (G_OBJECT (gst->priv->conf), "notify::volume",
- G_CALLBACK (parole_gst_conf_notify_volume_cb), gst);
+ g_signal_connect(G_OBJECT(gst->priv->conf), "notify",
+ G_CALLBACK(parole_gst_conf_notify_cb), gst);
+ g_signal_connect(G_OBJECT(gst->priv->conf), "notify::volume",
+ G_CALLBACK(parole_gst_conf_notify_volume_cb), gst);
}
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static gboolean
-parole_notify_volume_idle_cb (ParoleGst *gst)
+parole_notify_volume_idle_cb(ParoleGst *gst)
{
gdouble vol;
- vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (gst->priv->playbin),
+ vol = gst_stream_volume_get_volume(GST_STREAM_VOLUME(gst->priv->playbin),
GST_STREAM_VOLUME_FORMAT_CUBIC);
gst->priv->volume = vol;
- g_object_notify (G_OBJECT (gst), "volume");
+ g_object_notify(G_OBJECT(gst), "volume");
return FALSE;
}
static void
-parole_notify_volume_cb (GObject *object,
+parole_notify_volume_cb(GObject *object,
GParamSpec *pspec,
ParoleGst *gst)
{
- g_idle_add ((GSourceFunc) parole_notify_volume_idle_cb, gst);
+ g_idle_add((GSourceFunc) parole_notify_volume_idle_cb, gst);
}
static void
@@ -2080,7 +2080,7 @@ parole_gst_show_error(GtkWindow *window, GError *error)
{
GtkWidget *dialog;
gchar *message;
- dialog = gtk_message_dialog_new (NULL,
+ dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
@@ -2091,16 +2091,16 @@ parole_gst_show_error(GtkWindow *window, GError *error)
}
static void
-parole_gst_constructed (GObject *object)
+parole_gst_constructed(GObject *object)
{
ParoleGst *gst;
gchar *videosink = NULL;
gchar *playbin = NULL;
- gst = PAROLE_GST (object);
+ gst = PAROLE_GST(object);
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"videosink", &videosink,
NULL);
@@ -2111,70 +2111,70 @@ parole_gst_constructed (GObject *object)
#endif
/* Configure the playbin */
- gst->priv->playbin = gst_element_factory_make (playbin, "player");
+ gst->priv->playbin = gst_element_factory_make(playbin, "player");
if ( G_UNLIKELY (gst->priv->playbin == NULL) )
{
GError *error;
- error = g_error_new (1, 0, _("Unable to load \"%s\" plugin"
+ error = g_error_new(1, 0, _("Unable to load \"%s\" plugin"
", check your GStreamer installation."),
playbin);
- parole_gst_show_error (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))),
+ parole_gst_show_error(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(gst))),
error);
- g_error_free (error);
- g_error ("playbin load failed");
+ g_error_free(error);
+ g_error("playbin load failed");
}
g_free(playbin);
/* Configure the audio sink */
- gst->priv->audio_sink = gst_element_factory_make ("autoaudiosink", "audio");
+ gst->priv->audio_sink = gst_element_factory_make("autoaudiosink", "audio");
if ( G_UNLIKELY (gst->priv->audio_sink == NULL) )
{
GError *error;
- error = g_error_new (1, 0, _("Unable to load \"%s\" plugin"
+ error = g_error_new(1, 0, _("Unable to load \"%s\" plugin"
", check your GStreamer installation."), "autoaudiosink");
- parole_gst_show_error (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))),
+ parole_gst_show_error(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(gst))),
error);
- g_error_free (error);
- g_error ("autoaudiosink load failed");
+ g_error_free(error);
+ g_error("autoaudiosink load failed");
}
/* Configure the video sink */
if (g_strcmp0(videosink, "xvimagesink") == 0)
{
gst->priv->image_sink = XVIMAGESINK;
- gst->priv->video_sink = gst_element_factory_make ("xvimagesink", "video");
+ gst->priv->video_sink = gst_element_factory_make("xvimagesink", "video");
}
#ifdef HAVE_CLUTTER
if (g_strcmp0(videosink, "cluttersink") == 0)
{
gst->priv->image_sink = CLUTTERSINK;
- gst->priv->video_sink = gst_element_factory_make ("cluttersink", "video");
+ gst->priv->video_sink = gst_element_factory_make("cluttersink", "video");
}
#endif
if ( G_UNLIKELY (gst->priv->video_sink == NULL) )
{
gst->priv->image_sink = XIMAGESINK;
- g_debug ("%s trying to load ximagesink", g_strcmp0(videosink, "xvimagesink") ? "xvimagesink not found " : "xv disabled ");
- gst->priv->video_sink = gst_element_factory_make ("ximagesink", "video");
+ g_debug("%s trying to load ximagesink", g_strcmp0(videosink, "xvimagesink") ? "xvimagesink not found " : "xv disabled ");
+ gst->priv->video_sink = gst_element_factory_make("ximagesink", "video");
if ( G_UNLIKELY (gst->priv->video_sink == NULL) )
{
GError *error;
- error = g_error_new (1, 0, _("Unable to load \"%s\" plugin"
+ error = g_error_new(1, 0, _("Unable to load \"%s\" plugin"
", check your GStreamer installation."),
videosink);
- parole_gst_show_error (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))),
+ parole_gst_show_error(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(gst))),
error);
- g_error_free (error);
- g_error ("ximagesink load failed");
+ g_error_free(error);
+ g_error("ximagesink load failed");
}
}
- g_object_set (G_OBJECT (gst->priv->playbin),
+ g_object_set(G_OBJECT(gst->priv->playbin),
"video-sink", gst->priv->video_sink,
"audio-sink", gst->priv->audio_sink,
NULL);
@@ -2182,48 +2182,48 @@ parole_gst_constructed (GObject *object)
/*
* Listen to the bus events.
*/
- gst->priv->bus = gst_element_get_bus (gst->priv->playbin);
- gst_bus_add_signal_watch (gst->priv->bus);
+ gst->priv->bus = gst_element_get_bus(gst->priv->playbin);
+ gst_bus_add_signal_watch(gst->priv->bus);
gst->priv->sig1 =
- g_signal_connect (gst->priv->bus, "message",
- G_CALLBACK (parole_gst_bus_event), gst);
+ g_signal_connect(gst->priv->bus, "message",
+ G_CALLBACK(parole_gst_bus_event), gst);
/*
* Handling 'prepare-xwindow-id' message async causes XSync
* error in some occasions So we handle this message synchronously
*/
#if GST_CHECK_VERSION(1, 0, 0)
- gst_bus_set_sync_handler (gst->priv->bus, gst_bus_sync_signal_handler, gst, NULL);
+ gst_bus_set_sync_handler(gst->priv->bus, gst_bus_sync_signal_handler, gst, NULL);
#else
- gst_bus_set_sync_handler (gst->priv->bus, gst_bus_sync_signal_handler, gst);
+ gst_bus_set_sync_handler(gst->priv->bus, gst_bus_sync_signal_handler, gst);
#endif
gst->priv->sig2 =
- g_signal_connect (gst->priv->bus, "sync-message::element",
- G_CALLBACK (parole_gst_element_message_sync), gst);
+ g_signal_connect(gst->priv->bus, "sync-message::element",
+ G_CALLBACK(parole_gst_element_message_sync), gst);
- g_signal_connect (gst->priv->playbin, "notify::source",
- G_CALLBACK (parole_gst_source_notify_cb), gst);
+ g_signal_connect(gst->priv->playbin, "notify::source",
+ G_CALLBACK(parole_gst_source_notify_cb), gst);
- g_signal_connect (gst->priv->playbin, "notify::volume",
- G_CALLBACK (parole_notify_volume_cb), gst);
+ g_signal_connect(gst->priv->playbin, "notify::volume",
+ G_CALLBACK(parole_notify_volume_cb), gst);
- g_signal_connect (gst->priv->playbin, "about-to-finish",
- G_CALLBACK (parole_gst_about_to_finish_cb), gst);
+ g_signal_connect(gst->priv->playbin, "about-to-finish",
+ G_CALLBACK(parole_gst_about_to_finish_cb), gst);
- parole_gst_update_vis (gst);
- parole_gst_set_subtitle_encoding (gst);
- parole_gst_set_subtitle_font (gst);
+ parole_gst_update_vis(gst);
+ parole_gst_set_subtitle_encoding(gst);
+ parole_gst_set_subtitle_font(gst);
- TRACE ("End");
+ TRACE("End");
}
static void
-parole_gst_class_init (ParoleGstClass *klass)
+parole_gst_class_init(ParoleGstClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
object_class->finalize = parole_gst_finalize;
object_class->constructed = parole_gst_constructed;
@@ -2239,99 +2239,99 @@ parole_gst_class_init (ParoleGstClass *klass)
widget_class->button_release_event = parole_gst_button_release_event;
signals[MEDIA_STATE] =
- g_signal_new ("media-state",
+ g_signal_new("media-state",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, media_state),
+ G_STRUCT_OFFSET(ParoleGstClass, media_state),
NULL, NULL,
_gmarshal_VOID__OBJECT_ENUM,
G_TYPE_NONE, 2,
PAROLE_TYPE_STREAM, PAROLE_ENUM_TYPE_STATE);
signals[MEDIA_PROGRESSED] =
- g_signal_new ("media-progressed",
+ g_signal_new("media-progressed",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, media_progressed),
+ G_STRUCT_OFFSET(ParoleGstClass, media_progressed),
NULL, NULL,
_gmarshal_VOID__OBJECT_INT64,
G_TYPE_NONE, 2,
G_TYPE_OBJECT, G_TYPE_INT64);
signals[MEDIA_SEEKED] =
- g_signal_new ("media-seeked",
+ g_signal_new("media-seeked",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, media_seeked),
+ G_STRUCT_OFFSET(ParoleGstClass, media_seeked),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[MEDIA_TAG] =
- g_signal_new ("media-tag",
+ g_signal_new("media-tag",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, media_tag),
+ G_STRUCT_OFFSET(ParoleGstClass, media_tag),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
G_TYPE_OBJECT);
signals[BUFFERING] =
- g_signal_new ("buffering",
+ g_signal_new("buffering",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, buffering),
+ G_STRUCT_OFFSET(ParoleGstClass, buffering),
NULL, NULL,
_gmarshal_VOID__OBJECT_INT,
G_TYPE_NONE, 2,
G_TYPE_OBJECT, G_TYPE_INT);
signals[ERROR] =
- g_signal_new ("error",
+ g_signal_new("error",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, error),
+ G_STRUCT_OFFSET(ParoleGstClass, error),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1,
G_TYPE_STRING);
signals[DVD_CHAPTER_CHANGE] =
- g_signal_new ("dvd-chapter-change",
+ g_signal_new("dvd-chapter-change",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, dvd_chapter_change),
+ G_STRUCT_OFFSET(ParoleGstClass, dvd_chapter_change),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
signals[DVD_CHAPTER_COUNT_CHANGE] =
- g_signal_new ("dvd-chapter-count-change",
+ g_signal_new("dvd-chapter-count-change",
PAROLE_TYPE_GST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleGstClass, dvd_chapter_count_change),
+ G_STRUCT_OFFSET(ParoleGstClass, dvd_chapter_count_change),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_CONF_OBJ,
- g_param_spec_pointer ("conf-object",
+ g_param_spec_pointer("conf-object",
NULL, NULL,
G_PARAM_CONSTRUCT_ONLY|
G_PARAM_READWRITE));
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_VOLUME,
- g_param_spec_double ("volume", NULL, NULL,
+ g_param_spec_double("volume", NULL, NULL,
0.0, 1.0, 0.0,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_ENABLE_TAGS,
- g_param_spec_boolean ("tags",
+ g_param_spec_boolean("tags",
NULL, NULL,
TRUE,
G_PARAM_READWRITE));
@@ -2340,16 +2340,16 @@ parole_gst_class_init (ParoleGstClass *klass)
}
static void
-parole_gst_init (ParoleGst *gst)
+parole_gst_init(ParoleGst *gst)
{
- gst->priv = PAROLE_GST_GET_PRIVATE (gst);
+ gst->priv = PAROLE_GST_GET_PRIVATE(gst);
gst->priv->state = GST_STATE_VOID_PENDING;
gst->priv->target = GST_STATE_VOID_PENDING;
gst->priv->media_state = PAROLE_STATE_STOPPED;
gst->priv->aspect_ratio = PAROLE_ASPECT_RATIO_NONE;
- g_mutex_init (&gst->priv->lock);
- gst->priv->stream = parole_stream_new ();
+ g_mutex_init(&gst->priv->lock);
+ gst->priv->stream = parole_stream_new();
gst->priv->tick_id = 0;
gst->priv->update_vis = FALSE;
gst->priv->buffering = FALSE;
@@ -2366,7 +2366,7 @@ parole_gst_init (ParoleGst *gst)
gst->priv->volume = -1.0;
gst->priv->conf = NULL;
- gtk_widget_set_can_focus (GTK_WIDGET (gst), TRUE);
+ gtk_widget_set_can_focus(GTK_WIDGET(gst), TRUE);
/*
* Disable double buffering on the video output to avoid
@@ -2374,25 +2374,25 @@ parole_gst_init (ParoleGst *gst)
* Deprecated in GTK+ 3.12, but clutter is broken so adding back.
*/
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_widget_set_double_buffered (GTK_WIDGET (gst), FALSE);
+ gtk_widget_set_double_buffered(GTK_WIDGET(gst), FALSE);
G_GNUC_END_IGNORE_DEPRECATIONS
}
GtkWidget *
-parole_gst_new (gpointer conf_obj)
+parole_gst_new(gpointer conf_obj)
{
- parole_gst_object = g_object_new (PAROLE_TYPE_GST,
+ parole_gst_object = g_object_new(PAROLE_TYPE_GST,
"conf-object", conf_obj,
NULL);
- g_object_add_weak_pointer (parole_gst_object, &parole_gst_object);
+ g_object_add_weak_pointer(parole_gst_object, &parole_gst_object);
return GTK_WIDGET (parole_gst_object);
}
-GtkWidget *parole_gst_get (void)
+GtkWidget *parole_gst_get(void)
{
- if ( G_LIKELY (parole_gst_object != NULL ) ) {
+ if ( G_LIKELY(parole_gst_object != NULL ) ) {
/*
* Don't increase the reference count of this object as
* we need it to be destroyed immediately when the main
@@ -2400,29 +2400,29 @@ GtkWidget *parole_gst_get (void)
*/
// g_object_ref (parole_gst_object);
} else {
- parole_gst_object = g_object_new (PAROLE_TYPE_GST, NULL);
- g_object_add_weak_pointer (parole_gst_object, &parole_gst_object);
+ parole_gst_object = g_object_new(PAROLE_TYPE_GST, NULL);
+ g_object_add_weak_pointer(parole_gst_object, &parole_gst_object);
}
return GTK_WIDGET (parole_gst_object);
}
static gboolean
-parole_gst_play_idle (gpointer data)
+parole_gst_play_idle(gpointer data)
{
ParoleGst *gst;
- gst = PAROLE_GST (data);
+ gst = PAROLE_GST(data);
if ( gst->priv->state < GST_STATE_PAUSED )
- parole_gst_play_file_internal (gst);
+ parole_gst_play_file_internal(gst);
else
- parole_gst_change_state (gst, GST_STATE_READY);
+ parole_gst_change_state(gst, GST_STATE_READY);
return FALSE;
}
-void parole_gst_set_custom_subtitles (ParoleGst *gst, const gchar* sub_file)
+void parole_gst_set_custom_subtitles(ParoleGst *gst, const gchar* sub_file)
{
if ( sub_file == NULL ) {
gst->priv->use_custom_subtitles = FALSE;
@@ -2433,62 +2433,62 @@ void parole_gst_set_custom_subtitles (ParoleGst *gst, const gchar* sub_file)
}
}
-gchar * parole_gst_get_file_uri (ParoleGst *gst)
+gchar * parole_gst_get_file_uri(ParoleGst *gst)
{
gchar* uri;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"uri", &uri,
NULL);
return uri;
}
-void parole_gst_play_uri (ParoleGst *gst, const gchar *uri, const gchar *subtitles)
+void parole_gst_play_uri(ParoleGst *gst, const gchar *uri, const gchar *subtitles)
{
- g_mutex_lock (&gst->priv->lock);
+ g_mutex_lock(&gst->priv->lock);
gst->priv->target = GST_STATE_PLAYING;
- parole_stream_init_properties (gst->priv->stream);
+ parole_stream_init_properties(gst->priv->stream);
- g_object_set (G_OBJECT (gst->priv->stream),
+ g_object_set(G_OBJECT(gst->priv->stream),
"uri", uri,
"subtitles", subtitles,
NULL);
- g_mutex_unlock (&gst->priv->lock);
+ g_mutex_unlock(&gst->priv->lock);
if ( gst->priv->state_change_id == 0 )
- gst->priv->state_change_id = g_timeout_add_seconds (20,
+ gst->priv->state_change_id = g_timeout_add_seconds(20,
(GSourceFunc) parole_gst_check_state_change_timeout,
gst);
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
- g_idle_add ((GSourceFunc) parole_gst_play_idle, gst);
+ g_idle_add((GSourceFunc) parole_gst_play_idle, gst);
gst->priv->device = NULL;
}
-void parole_gst_play_device_uri (ParoleGst *gst, const gchar *uri, const gchar *device)
+void parole_gst_play_device_uri(ParoleGst *gst, const gchar *uri, const gchar *device)
{
const gchar *local_uri = NULL;
- TRACE ("device : %s", device);
+ TRACE("device : %s", device);
if ( gst->priv->device )
{
- g_free (gst->priv->device);
+ g_free(gst->priv->device);
gst->priv->device = NULL;
}
- gst->priv->device = g_strdup (device);
+ gst->priv->device = g_strdup(device);
/*
* Don't play cdda:/ as gstreamer gives an error
* but cdda:// works.
*/
- if ( G_UNLIKELY (!g_strcmp0 (uri, "cdda:/") ) ) {
+ if ( G_UNLIKELY(!g_strcmp0(uri, "cdda:/") ) ) {
local_uri = "cdda://";
} else if (g_strcmp0(uri, "cdda://") == 0) {
local_uri = "cdda://";
@@ -2500,66 +2500,66 @@ void parole_gst_play_device_uri (ParoleGst *gst, const gchar *uri, const gchar *
}
}
- parole_gst_play_uri (gst, local_uri, NULL);
+ parole_gst_play_uri(gst, local_uri, NULL);
}
-void parole_gst_pause (ParoleGst *gst)
+void parole_gst_pause(ParoleGst *gst)
{
- g_mutex_lock (&gst->priv->lock);
+ g_mutex_lock(&gst->priv->lock);
gst->priv->target = GST_STATE_PAUSED;
- g_mutex_unlock (&gst->priv->lock);
+ g_mutex_unlock(&gst->priv->lock);
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
- parole_gst_change_state (gst, GST_STATE_PAUSED);
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
+ parole_gst_change_state(gst, GST_STATE_PAUSED);
}
-void parole_gst_resume (ParoleGst *gst)
+void parole_gst_resume(ParoleGst *gst)
{
- g_mutex_lock (&gst->priv->lock);
+ g_mutex_lock(&gst->priv->lock);
gst->priv->target = GST_STATE_PLAYING;
- g_mutex_unlock (&gst->priv->lock);
+ g_mutex_unlock(&gst->priv->lock);
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
- parole_gst_change_state (gst, GST_STATE_PLAYING);
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
+ parole_gst_change_state(gst, GST_STATE_PLAYING);
}
static gboolean
-parole_gst_stop_idle (gpointer data)
+parole_gst_stop_idle(gpointer data)
{
ParoleGst *gst;
- gst = PAROLE_GST (data);
+ gst = PAROLE_GST(data);
- parole_gst_change_state (gst, GST_STATE_NULL);
+ parole_gst_change_state(gst, GST_STATE_NULL);
return FALSE;
}
-void parole_gst_stop (ParoleGst *gst)
+void parole_gst_stop(ParoleGst *gst)
{
- g_mutex_lock (&gst->priv->lock);
+ g_mutex_lock(&gst->priv->lock);
- parole_stream_init_properties (gst->priv->stream);
+ parole_stream_init_properties(gst->priv->stream);
gst->priv->target = GST_STATE_NULL;
- g_mutex_unlock (&gst->priv->lock);
+ g_mutex_unlock(&gst->priv->lock);
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
- g_idle_add ((GSourceFunc) parole_gst_stop_idle, gst);
+ g_idle_add((GSourceFunc) parole_gst_stop_idle, gst);
}
-void parole_gst_terminate (ParoleGst *gst)
+void parole_gst_terminate(ParoleGst *gst)
{
gst->priv->terminating = TRUE;
- parole_gst_terminate_internal (gst);
+ parole_gst_terminate_internal(gst);
}
-void parole_gst_shutdown (ParoleGst *gst)
+void parole_gst_shutdown(ParoleGst *gst)
{
/**
* FIXME: See https://bugzilla.xfce.org/show_bug.cgi?id=12169
@@ -2576,18 +2576,18 @@ void parole_gst_shutdown (ParoleGst *gst)
*/
if ( gst->priv->bus )
- g_object_unref (gst->priv->bus);
+ g_object_unref(gst->priv->bus);
- gst_element_set_state (gst->priv->playbin, GST_STATE_VOID_PENDING);
+ gst_element_set_state(gst->priv->playbin, GST_STATE_VOID_PENDING);
if ( gst->priv->playbin )
- g_object_unref (gst->priv->playbin);
+ g_object_unref(gst->priv->playbin);
}
-void parole_gst_seek (ParoleGst *gst, gdouble seek)
+void parole_gst_seek(ParoleGst *gst, gdouble seek)
{
- TRACE ("Seeking");
- g_warn_if_fail (gst_element_seek (gst->priv->playbin,
+ TRACE("Seeking");
+ g_warn_if_fail(gst_element_seek(gst->priv->playbin,
1.0,
GST_FORMAT_TIME,
GST_SEEK_FLAG_KEY_UNIT | GST_SEEK_FLAG_FLUSH,
@@ -2597,190 +2597,190 @@ void parole_gst_seek (ParoleGst *gst, gdouble seek)
gst->priv->seeking = TRUE;
}
-void parole_gst_set_volume (ParoleGst *gst, gdouble volume)
+void parole_gst_set_volume(ParoleGst *gst, gdouble volume)
{
- volume = CLAMP (volume, 0.0, 1.0);
+ volume = CLAMP(volume, 0.0, 1.0);
if (gst->priv->volume != volume)
{
- gst_stream_volume_set_volume (GST_STREAM_VOLUME (gst->priv->playbin),
+ gst_stream_volume_set_volume(GST_STREAM_VOLUME(gst->priv->playbin),
GST_STREAM_VOLUME_FORMAT_CUBIC,
volume);
gst->priv->volume = volume;
- g_object_notify (G_OBJECT (gst), "volume");
+ g_object_notify(G_OBJECT(gst), "volume");
}
}
-gdouble parole_gst_get_volume (ParoleGst *gst)
+gdouble parole_gst_get_volume(ParoleGst *gst)
{
return gst->priv->volume;
}
-ParoleState parole_gst_get_state (ParoleGst *gst)
+ParoleState parole_gst_get_state(ParoleGst *gst)
{
return gst->priv->media_state;
}
-GstState parole_gst_get_gst_state (ParoleGst *gst)
+GstState parole_gst_get_gst_state(ParoleGst *gst)
{
return gst->priv->state;
}
-GstState parole_gst_get_gst_target_state (ParoleGst *gst)
+GstState parole_gst_get_gst_target_state(ParoleGst *gst)
{
return gst->priv->target;
}
-void parole_gst_next_dvd_chapter (ParoleGst *gst)
+void parole_gst_next_dvd_chapter(ParoleGst *gst)
{
- parole_gst_change_dvd_chapter (gst, 1);
+ parole_gst_change_dvd_chapter(gst, 1);
}
-void parole_gst_prev_dvd_chapter (ParoleGst *gst)
+void parole_gst_prev_dvd_chapter(ParoleGst *gst)
{
- parole_gst_change_dvd_chapter (gst, -1);
+ parole_gst_change_dvd_chapter(gst, -1);
}
-void parole_gst_set_dvd_chapter (ParoleGst *gst, gint chapter)
+void parole_gst_set_dvd_chapter(ParoleGst *gst, gint chapter)
{
- GstFormat format = gst_format_get_by_nick ("chapter");
+ GstFormat format = gst_format_get_by_nick("chapter");
guint64 val = (guint64) chapter;
- gst_element_seek (gst->priv->playbin, 1.0, format,
+ gst_element_seek(gst->priv->playbin, 1.0, format,
GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET,
val,
GST_SEEK_TYPE_NONE,
0);
}
-gint parole_gst_get_num_tracks (ParoleGst *gst)
+gint parole_gst_get_num_tracks(ParoleGst *gst)
{
gint num_tracks;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"num-tracks", &num_tracks,
NULL);
return num_tracks;
}
-void parole_gst_seek_cdda (ParoleGst *gst, guint track_num)
+void parole_gst_seek_cdda(ParoleGst *gst, guint track_num)
{
gint current_track;
- current_track = parole_gst_get_current_cdda_track (gst);
+ current_track = parole_gst_get_current_cdda_track(gst);
- parole_gst_change_cdda_track (gst, (gint) track_num - current_track -1);
+ parole_gst_change_cdda_track(gst, (gint)track_num - current_track - 1);
}
-gint parole_gst_get_current_cdda_track (ParoleGst *gst)
+gint parole_gst_get_current_cdda_track(ParoleGst *gst)
{
- GstFormat format = gst_format_get_by_nick ("track");
+ GstFormat format = gst_format_get_by_nick("track");
gint64 pos;
gint ret_val = 1;
#if GST_CHECK_VERSION(1, 0, 0)
- if (gst_element_query_position (gst->priv->playbin, format, &pos)) {
+ if (gst_element_query_position(gst->priv->playbin, format, &pos)) {
#else
- if (gst_element_query_position (gst->priv->playbin, &format, &pos)) {
+ if (gst_element_query_position(gst->priv->playbin, &format, &pos)) {
#endif
- TRACE ("Pos %" G_GINT64_FORMAT, pos);
+ TRACE("Pos %" G_GINT64_FORMAT, pos);
ret_val = (gint) pos;
}
return ret_val;
}
-gint64 parole_gst_get_stream_duration (ParoleGst *gst)
+gint64 parole_gst_get_stream_duration(ParoleGst *gst)
{
gint64 dur;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"duration", &dur,
NULL);
return dur;
}
-gint64 parole_gst_get_stream_position (ParoleGst *gst)
+gint64 parole_gst_get_stream_position(ParoleGst *gst)
{
GstFormat format = GST_FORMAT_TIME;
gint64 pos;
#if GST_CHECK_VERSION(1, 0, 0)
- gst_element_query_position (gst->priv->playbin, format, &pos);
+ gst_element_query_position(gst->priv->playbin, format, &pos);
#else
- gst_element_query_position (gst->priv->playbin, &format, &pos);
+ gst_element_query_position(gst->priv->playbin, &format, &pos);
#endif
return pos / GST_SECOND;
}
-gboolean parole_gst_get_is_xvimage_sink (ParoleGst *gst)
+gboolean parole_gst_get_is_xvimage_sink(ParoleGst *gst)
{
return gst->priv->image_sink == XVIMAGESINK;
}
void
-parole_gst_set_cursor_visible (ParoleGst *gst, gboolean visible)
+parole_gst_set_cursor_visible(ParoleGst *gst, gboolean visible)
{
if ( visible ) {
if (gst->priv->target == gst->priv->state)
- parole_window_normal_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ parole_window_normal_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
else
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
} else {
- parole_window_invisible_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+ parole_window_invisible_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
}
}
GList *
-gst_get_lang_list_for_type (ParoleGst * gst, const gchar * type_name)
+gst_get_lang_list_for_type(ParoleGst * gst, const gchar * type_name)
{
GList *ret = NULL;
gint num = 1;
- if (g_str_equal (type_name, "AUDIO")) {
+ if (g_str_equal(type_name, "AUDIO")) {
gint i, n;
- g_object_get (G_OBJECT (gst->priv->playbin), "n-audio", &n, NULL);
+ g_object_get(G_OBJECT(gst->priv->playbin), "n-audio", &n, NULL);
if (n == 0)
return NULL;
for (i = 0; i < n; i++) {
GstTagList *tags = NULL;
- g_signal_emit_by_name (G_OBJECT (gst->priv->playbin), "get-audio-tags",
+ g_signal_emit_by_name(G_OBJECT(gst->priv->playbin), "get-audio-tags",
i, &tags);
if (tags) {
gchar *lc = NULL, *cd = NULL, *language_name = NULL;
- gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE, &lc);
- gst_tag_list_get_string (tags, GST_TAG_CODEC, &cd);
+ gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &lc);
+ gst_tag_list_get_string(tags, GST_TAG_CODEC, &cd);
if (lc) {
language_name = g_strdup(gst_tag_get_language_name(lc));
if (language_name) {
- ret = g_list_prepend (ret, language_name);
+ ret = g_list_prepend(ret, language_name);
} else {
- ret = g_list_prepend (ret, lc);
+ ret = g_list_prepend(ret, lc);
}
- g_free (cd);
+ g_free(cd);
} else if (cd) {
- ret = g_list_prepend (ret, cd);
+ ret = g_list_prepend(ret, cd);
} else {
- ret = g_list_prepend (ret, g_strdup_printf (_("Audio Track #%d"), num++));
+ ret = g_list_prepend(ret, g_strdup_printf(_("Audio Track #%d"), num++));
}
- gst_tag_list_free (tags);
+ gst_tag_list_free(tags);
} else {
- ret = g_list_prepend (ret, g_strdup_printf (_("Audio Track #%d"), num++));
+ ret = g_list_prepend(ret, g_strdup_printf(_("Audio Track #%d"), num++));
}
}
- } else if (g_str_equal (type_name, "TEXT")) {
+ } else if (g_str_equal(type_name, "TEXT")) {
gint i, n = 0;
- g_object_get (G_OBJECT (gst->priv->playbin), "n-text", &n, NULL);
+ g_object_get(G_OBJECT(gst->priv->playbin), "n-text", &n, NULL);
if (n == 0 && gst->priv->use_custom_subtitles == FALSE)
return NULL;
@@ -2792,40 +2792,40 @@ gst_get_lang_list_for_type (ParoleGst * gst, const gchar * type_name)
for (i = 0; i < n; i++) {
GstTagList *tags = NULL;
- g_signal_emit_by_name (G_OBJECT (gst->priv->playbin), "get-text-tags",
+ g_signal_emit_by_name(G_OBJECT(gst->priv->playbin), "get-text-tags",
i, &tags);
if (tags) {
gchar *lc = NULL, *cd = NULL, *language_name = NULL;
- gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE, &lc);
- gst_tag_list_get_string (tags, GST_TAG_CODEC, &lc);
+ gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &lc);
+ gst_tag_list_get_string(tags, GST_TAG_CODEC, &lc);
if (lc) {
language_name = g_strdup(gst_tag_get_language_name(lc));
if (language_name)
{
- ret = g_list_prepend (ret, language_name);
+ ret = g_list_prepend(ret, language_name);
} else {
- ret = g_list_prepend (ret, lc);
+ ret = g_list_prepend(ret, lc);
}
- g_free (cd);
+ g_free(cd);
} else {
- ret = g_list_prepend (ret, g_strdup_printf (_("Subtitle #%d"), num++));
+ ret = g_list_prepend(ret, g_strdup_printf(_("Subtitle #%d"), num++));
}
- gst_tag_list_free (tags);
+ gst_tag_list_free(tags);
} else {
- ret = g_list_prepend (ret, g_strdup_printf (_("Subtitle #%d"), num++));
+ ret = g_list_prepend(ret, g_strdup_printf(_("Subtitle #%d"), num++));
}
}
}
if ( gst->priv->use_custom_subtitles == TRUE )
{
- ret = g_list_append (ret, g_strdup_printf("%s", gst->priv->custom_subtitles));
+ ret = g_list_append(ret, g_strdup_printf("%s", gst->priv->custom_subtitles));
}
} else {
- g_critical ("Invalid stream type '%s'", type_name);
+ g_critical("Invalid stream type '%s'", type_name);
return NULL;
}
@@ -2837,7 +2837,7 @@ gst_get_has_vis(ParoleGst *gst)
{
gboolean has_vis;
- g_object_get (G_OBJECT (gst->priv->conf),
+ g_object_get(G_OBJECT(gst->priv->conf),
"vis-enabled", &has_vis,
NULL);
@@ -2849,7 +2849,7 @@ gst_get_has_video(ParoleGst *gst)
{
gboolean playing_video;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"has-video", &playing_video,
NULL);
@@ -2859,7 +2859,7 @@ gst_get_has_video(ParoleGst *gst)
void
gst_set_current_audio_track(ParoleGst *gst, gint track_no)
{
- g_object_set (G_OBJECT (gst->priv->playbin), "current-audio", (track_no), NULL);
+ g_object_set(G_OBJECT(gst->priv->playbin), "current-audio", track_no, NULL);
}
void
@@ -2868,7 +2868,7 @@ gst_set_current_subtitle_track(ParoleGst *gst, gint track_no)
gchar *uri, *sub;
gint flags;
- g_object_get (G_OBJECT (gst->priv->stream),
+ g_object_get(G_OBJECT(gst->priv->stream),
"uri", &uri,
NULL);
@@ -2877,7 +2877,7 @@ gst_set_current_subtitle_track(ParoleGst *gst, gint track_no)
else
sub = (gchar*) parole_get_subtitle_path(uri);
- g_object_get (gst->priv->playbin, "flags", &flags, NULL);
+ g_object_get(gst->priv->playbin, "flags", &flags, NULL);
track_no = track_no -1;
@@ -2891,26 +2891,26 @@ gst_set_current_subtitle_track(ParoleGst *gst, gint track_no)
if (track_no == -1)
sub = NULL;
- g_object_set (gst->priv->playbin, "flags", flags, "suburi", sub, "current-text", track_no, NULL);
+ g_object_set(gst->priv->playbin, "flags", flags, "suburi", sub, "current-text", track_no, NULL);
if (flags & GST_PLAY_FLAG_TEXT) {
- g_object_get (gst->priv->playbin, "current-text", &track_no, NULL);
+ g_object_get(gst->priv->playbin, "current-text", &track_no, NULL);
}
parole_gst_load_subtitle(gst);
}
-const ParoleStream *parole_gst_get_stream (ParoleGst *gst)
+const ParoleStream *parole_gst_get_stream(ParoleGst *gst)
{
- g_return_val_if_fail (PAROLE_IS_GST (gst), NULL);
+ g_return_val_if_fail(PAROLE_IS_GST(gst), NULL);
return gst->priv->stream;
}
-GstElement *parole_gst_video_sink (ParoleGst *gst)
+GstElement *parole_gst_video_sink(ParoleGst *gst)
{
GstElement *video_sink;
- g_object_get (G_OBJECT (gst->priv->playbin),
+ g_object_get(G_OBJECT(gst->priv->playbin),
"video-sink", &video_sink,
NULL);
return video_sink;
diff --git a/src/main.c b/src/main.c
index 16fcb5a..8cf940d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,23 +54,23 @@
#include "parole-conf.h"
static void G_GNUC_NORETURN
-show_version (void)
+show_version(void)
{
- g_print (_("\n"
+ g_print(_("\n"
"Parole Media Player %s\n\n"
"Part of the Xfce Goodies Project\n"
"https://goodies.xfce.org\n\n"
"Licensed under the GNU GPL.\n\n"
"Please report bugs to <https://bugzilla.xfce.org/>.\n\n"), VERSION);
- exit (EXIT_SUCCESS);
+ exit(EXIT_SUCCESS);
}
static void
-parole_sig_handler (gint sig, gpointer data)
+parole_sig_handler(gint sig, gpointer data)
{
ParolePlayer *player = (ParolePlayer *) data;
- parole_player_terminate (player);
+ parole_player_terminate(player);
}
/**
@@ -81,35 +81,35 @@ parole_sig_handler (gint sig, gpointer data)
* Load the discs that is passed as a cli argument to Parole.
**/
static void
-parole_send_play_disc (const gchar *uri, const gchar *device)
+parole_send_play_disc(const gchar *uri, const gchar *device)
{
DBusGProxy *proxy;
GError *error = NULL;
gchar *uri_local;
if ( uri ) {
- uri_local = g_strdup (uri);
+ uri_local = g_strdup(uri);
} else {
- uri_local = parole_get_uri_from_unix_device (device);
+ uri_local = parole_get_uri_from_unix_device(device);
}
- proxy = parole_get_proxy (PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
+ proxy = parole_get_proxy(PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
- dbus_g_proxy_call (proxy, "PlayDisc", &error,
+ dbus_g_proxy_call(proxy, "PlayDisc", &error,
G_TYPE_STRING, uri_local,
G_TYPE_STRING, device,
G_TYPE_INVALID,
G_TYPE_INVALID);
- g_free (uri_local);
+ g_free(uri_local);
if ( error )
{
- g_critical ("Unable to send uri to Parole: %s", error->message);
- g_error_free (error);
+ g_critical("Unable to send uri to Parole: %s", error->message);
+ g_error_free(error);
}
- g_object_unref (proxy);
+ g_object_unref(proxy);
}
/**
@@ -121,7 +121,7 @@ parole_send_play_disc (const gchar *uri, const gchar *device)
* Load files that are passed as cli arguments to Parole.
**/
static void
-parole_send_files (gchar **filenames, gboolean enqueue)
+parole_send_files(gchar **filenames, gboolean enqueue)
{
DBusGProxy *proxy;
GFile *file;
@@ -129,21 +129,21 @@ parole_send_files (gchar **filenames, gboolean enqueue)
GError *error = NULL;
guint i;
- proxy = parole_get_proxy (PAROLE_DBUS_PLAYLIST_PATH, PAROLE_DBUS_PLAYLIST_INTERFACE);
+ proxy = parole_get_proxy(PAROLE_DBUS_PLAYLIST_PATH, PAROLE_DBUS_PLAYLIST_INTERFACE);
if ( !proxy )
- g_error ("Unable to create proxy for %s", PAROLE_DBUS_NAME);
+ g_error("Unable to create proxy for %s", PAROLE_DBUS_NAME);
- out_paths = g_new0 (gchar *, g_strv_length (filenames) + 1);
+ out_paths = g_new0(gchar *, g_strv_length(filenames) + 1);
for ( i = 0; filenames && filenames[i]; i++)
{
- file = g_file_new_for_commandline_arg (filenames[i]);
- out_paths[i] = g_file_get_path (file);
- g_object_unref (file);
+ file = g_file_new_for_commandline_arg(filenames[i]);
+ out_paths[i] = g_file_get_path(file);
+ g_object_unref(file);
}
- dbus_g_proxy_call (proxy, "AddFiles", &error,
+ dbus_g_proxy_call(proxy, "AddFiles", &error,
G_TYPE_STRV, out_paths,
G_TYPE_BOOLEAN, enqueue,
G_TYPE_INVALID,
@@ -152,12 +152,12 @@ parole_send_files (gchar **filenames, gboolean enqueue)
if ( error )
{
- g_critical ("Unable to send media files to Parole: %s", error->message);
- g_error_free (error);
+ g_critical("Unable to send media files to Parole: %s", error->message);
+ g_error_free(error);
}
- g_strfreev (out_paths);
- g_object_unref (proxy);
+ g_strfreev(out_paths);
+ g_object_unref(proxy);
}
/**
@@ -170,12 +170,12 @@ parole_send_files (gchar **filenames, gboolean enqueue)
* Load the files or device that are passed as cli arguments to Parole.
**/
static void
-parole_send (gchar **filenames, gchar *device, gboolean enqueue)
+parole_send(gchar **filenames, gchar *device, gboolean enqueue)
{
if ( g_strv_length (filenames) == 1 && parole_is_uri_disc (filenames[0]))
- parole_send_play_disc (filenames[0], device);
+ parole_send_play_disc(filenames[0], device);
else
- parole_send_files (filenames, enqueue);
+ parole_send_files(filenames, enqueue);
}
/**
@@ -185,27 +185,27 @@ parole_send (gchar **filenames, gchar *device, gboolean enqueue)
* Send a message via DBUS to Parole.
**/
static void
-parole_send_message (const gchar *message)
+parole_send_message(const gchar *message)
{
DBusGProxy *proxy;
GError *error = NULL;
- proxy = parole_get_proxy (PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
+ proxy = parole_get_proxy(PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
- dbus_g_proxy_call (proxy, message, &error,
+ dbus_g_proxy_call(proxy, message, &error,
G_TYPE_INVALID,
G_TYPE_INVALID);
if ( error )
{
- g_critical ("Failed to send message : %s : %s", message, error->message);
- g_error_free (error);
+ g_critical("Failed to send message : %s : %s", message, error->message);
+ g_error_free(error);
}
- g_object_unref (proxy);
+ g_object_unref(proxy);
}
-int main (int argc, char **argv)
+int main(int argc, char **argv)
{
ParolePlayer *player;
ParolePluginsManager *plugins;
@@ -254,108 +254,108 @@ int main (int argc, char **argv)
};
if (g_thread_supported ())
- dbus_threads_init_default ();
+ dbus_threads_init_default();
/* initialize xfconf */
if (!xfconf_init (&error))
{
- g_critical ("Failed to initialize Xfconf: %s", error->message);
- g_error_free (error);
+ g_critical("Failed to initialize Xfconf: %s", error->message);
+ g_error_free(error);
return EXIT_FAILURE;
}
XInitThreads();
- xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+ xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
- g_set_application_name (PACKAGE_NAME);
+ g_set_application_name(PACKAGE_NAME);
- gtk_init (&argc, &argv);
+ gtk_init(&argc, &argv);
- ctx = g_option_context_new (_("[FILES...] - Play movies and songs"));
+ ctx = g_option_context_new(_("[FILES...] - Play movies and songs"));
- gst_option_group = gst_init_get_option_group ();
- g_option_context_add_main_entries (ctx, option_entries, GETTEXT_PACKAGE);
- g_option_context_set_translation_domain (ctx, GETTEXT_PACKAGE);
- g_option_context_add_group (ctx, gst_option_group);
+ gst_option_group = gst_init_get_option_group();
+ g_option_context_add_main_entries(ctx, option_entries, GETTEXT_PACKAGE);
+ g_option_context_set_translation_domain(ctx, GETTEXT_PACKAGE);
+ g_option_context_add_group(ctx, gst_option_group);
- g_option_context_add_group (ctx, gtk_get_option_group (TRUE));
+ g_option_context_add_group(ctx, gtk_get_option_group(TRUE));
if ( !g_option_context_parse (ctx, &argc, &argv, &error) )
{
- g_print ("%s\n", error->message);
- g_print (_("Type %s --help to list all available command line options\n"), argv[0]);
- g_error_free (error);
- g_option_context_free (ctx);
+ g_print("%s\n", error->message);
+ g_print(_("Type %s --help to list all available command line options\n"), argv[0]);
+ g_error_free(error);
+ g_option_context_free(ctx);
return EXIT_FAILURE;
}
- g_option_context_free (ctx);
+ g_option_context_free(ctx);
if ( version )
- show_version ();
+ show_version();
/* Check for cli options if there is an instance of Parole already */
if ( !new_instance && parole_dbus_name_has_owner (PAROLE_DBUS_NAME) )
{
/* Clear startup notification */
- gdk_notify_startup_complete ();
+ gdk_notify_startup_complete();
if (!enqueue && !play && !next_track && !prev_track &&
!raise_volume && !lower_volume && !mute && !unmute)
- g_print (_("Parole is already running, use -i to open a new instance\n"));
+ g_print(_("Parole is already running, use -i to open a new instance\n"));
if ( filenames && filenames[0] != NULL )
- parole_send (filenames, device, enqueue);
+ parole_send(filenames, device, enqueue);
else if (device != NULL)
- parole_send_play_disc (NULL, device);
+ parole_send_play_disc(NULL, device);
if ( play )
- parole_send_message ("Play");
+ parole_send_message("Play");
if ( next_track )
- parole_send_message ("NextTrack");
+ parole_send_message("NextTrack");
if ( prev_track )
- parole_send_message ("PrevTrack");
+ parole_send_message("PrevTrack");
if ( raise_volume )
- parole_send_message ("RaiseVolume");
+ parole_send_message("RaiseVolume");
if ( lower_volume )
- parole_send_message ("LowerVolume");
+ parole_send_message("LowerVolume");
if ( mute )
- parole_send_message ("Mute");
+ parole_send_message("Mute");
if ( unmute )
- parole_send_message ("Unmute");
+ parole_send_message("Unmute");
/* Create a new instance because Parole isn't running */
} else {
- builder = parole_builder_get_main_interface ();
- parole_dbus_register_name (PAROLE_DBUS_NAME);
+ builder = parole_builder_get_main_interface();
+ parole_dbus_register_name(PAROLE_DBUS_NAME);
- player = parole_player_new (client_id);
- g_free (client_id);
+ player = parole_player_new(client_id);
+ g_free(client_id);
if (embedded)
- parole_player_embedded (player);
+ parole_player_embedded(player);
else if (fullscreen)
- parole_player_full_screen (player, TRUE);
+ parole_player_full_screen(player, TRUE);
if ( filenames && filenames[0] != NULL ) {
- if (g_strv_length (filenames) == 1 && parole_is_uri_disc (filenames[0])) {
- parole_player_play_uri_disc (player, filenames[0], device);
+ if (g_strv_length(filenames) == 1 && parole_is_uri_disc(filenames[0])) {
+ parole_player_play_uri_disc(player, filenames[0], device);
} else {
ParoleMediaList *list;
- list = parole_player_get_media_list (player);
- parole_media_list_add_files (list, filenames, enqueue);
+ list = parole_player_get_media_list(player);
+ parole_media_list_add_files(list, filenames, enqueue);
}
} else if ( device != NULL ) {
- parole_player_play_uri_disc (player, NULL, device);
+ parole_player_play_uri_disc(player, NULL, device);
}
- if (xfce_posix_signal_handler_init (&error)) {
+ if (xfce_posix_signal_handler_init(&error)) {
xfce_posix_signal_handler_set_handler(SIGHUP,
parole_sig_handler,
player, NULL);
@@ -368,23 +368,23 @@ int main (int argc, char **argv)
parole_sig_handler,
player, NULL);
} else {
- g_warning ("Unable to set up POSIX signal handlers: %s", error->message);
- g_error_free (error);
+ g_warning("Unable to set up POSIX signal handlers: %s", error->message);
+ g_error_free(error);
}
/* Initialize the plugin-manager and load the plugins */
- plugins = parole_plugins_manager_new (!no_plugins);
- parole_plugins_manager_load (plugins);
- g_object_unref (builder);
+ plugins = parole_plugins_manager_new(!no_plugins);
+ parole_plugins_manager_load(plugins);
+ g_object_unref(builder);
/* Start main process */
- gdk_notify_startup_complete ();
- gtk_main ();
+ gdk_notify_startup_complete();
+ gtk_main();
- parole_dbus_release_name (PAROLE_DBUS_NAME);
- g_object_unref (plugins);
+ parole_dbus_release_name(PAROLE_DBUS_NAME);
+ g_object_unref(plugins);
}
- gst_deinit ();
+ gst_deinit();
return 0;
}
diff --git a/src/misc/parole-debug.c b/src/misc/parole-debug.c
index 3065535..cac61a5 100644
--- a/src/misc/parole-debug.c
+++ b/src/misc/parole-debug.c
@@ -35,25 +35,25 @@
#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)
-void parole_debug_enum (const gchar *func, const gchar *file, gint line,
+void parole_debug_enum(const gchar *func, const gchar *file, gint line,
const gchar *text, gint v_enum, GType type)
{
gchar *content = NULL;
GValue __value__ = { 0, };
- g_value_init (&__value__, type);
- g_value_set_enum (&__value__, v_enum);
+ g_value_init(&__value__, type);
+ g_value_set_enum(&__value__, v_enum);
- content = g_strdup_value_contents (&__value__);
+ content = g_strdup_value_contents(&__value__);
fprintf(stdout, "TRACE[%s:%d] %s(): %s : %s", file, line , func, text, content);
fprintf(stdout, "\n");
- g_value_unset (&__value__);
- g_free (content);
+ g_value_unset(&__value__);
+ g_free(content);
}
-void parole_debug_enum_full (const gchar *func, const gchar *file, gint line,
+void parole_debug_enum_full(const gchar *func, const gchar *file, gint line,
gint v_enum, GType type, const gchar *format, ...)
{
va_list args;
@@ -62,22 +62,22 @@ void parole_debug_enum_full (const gchar *func, const gchar *file, gint line,
gchar *content = NULL;
GValue __value__ = { 0, };
- g_value_init (&__value__, type);
- g_value_set_enum (&__value__, v_enum);
+ g_value_init(&__value__, type);
+ g_value_set_enum(&__value__, v_enum);
- content = g_strdup_value_contents (&__value__);
+ content = g_strdup_value_contents(&__value__);
- va_start (args, format);
- g_vasprintf (&buffer, format, args);
- va_end (args);
+ va_start(args, format);
+ g_vasprintf(&buffer, format, args);
+ va_end(args);
fprintf(stdout, "TRACE[%s:%d] %s(): ", file, line, func);
fprintf(stdout, "%s: %s", buffer, content);
fprintf(stdout, "\n");
- g_value_unset (&__value__);
- g_free (content);
- g_free (buffer);
+ g_value_unset(&__value__);
+ g_free(content);
+ g_free(buffer);
}
#endif /*#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)*/
diff --git a/src/misc/parole-file.c b/src/misc/parole-file.c
index afb0fed..05d78c8 100644
--- a/src/misc/parole-file.c
+++ b/src/misc/parole-file.c
@@ -38,7 +38,7 @@
#include "parole-file.h"
#define PAROLE_FILE_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_FILE, ParoleFilePrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_FILE, ParoleFilePrivate))
typedef struct _ParoleFilePrivate ParoleFilePrivate;
@@ -65,107 +65,107 @@ enum
PROP_DVD_CHAPTER
};
-G_DEFINE_TYPE (ParoleFile, parole_file, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleFile, parole_file, G_TYPE_OBJECT)
static void
-parole_file_finalize (GObject *object)
+parole_file_finalize(GObject *object)
{
ParoleFile *file;
ParoleFilePrivate *priv;
- file = PAROLE_FILE (object);
- priv = PAROLE_FILE_GET_PRIVATE (file);
+ file = PAROLE_FILE(object);
+ priv = PAROLE_FILE_GET_PRIVATE(file);
if ( priv->filename )
- g_free (priv->filename);
+ g_free(priv->filename);
if ( priv->uri )
- g_free (priv->uri);
+ g_free(priv->uri);
if ( priv->display_name )
- g_free (priv->display_name);
+ g_free(priv->display_name);
if ( priv->content_type )
- g_free (priv->content_type);
+ g_free(priv->content_type);
if ( priv->directory )
- g_free (priv->directory);
+ g_free(priv->directory);
if ( priv->custom_subtitles )
- g_free (priv->custom_subtitles);
+ g_free(priv->custom_subtitles);
- G_OBJECT_CLASS (parole_file_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_file_parent_class)->finalize(object);
}
static void
-parole_file_set_property (GObject *object, guint prop_id,
+parole_file_set_property(GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
ParoleFile *file;
- file = PAROLE_FILE (object);
+ file = PAROLE_FILE(object);
switch (prop_id)
{
case PROP_PATH:
- PAROLE_FILE_GET_PRIVATE (file)->filename = g_value_dup_string (value);
+ PAROLE_FILE_GET_PRIVATE(file)->filename = g_value_dup_string(value);
break;
case PROP_DISPLAY_NAME:
- PAROLE_FILE_GET_PRIVATE (file)->display_name = g_value_dup_string (value);
+ PAROLE_FILE_GET_PRIVATE(file)->display_name = g_value_dup_string(value);
break;
case PROP_DIRECTORY:
- PAROLE_FILE_GET_PRIVATE (file)->directory = g_value_dup_string (value);
+ PAROLE_FILE_GET_PRIVATE(file)->directory = g_value_dup_string(value);
break;
case PROP_CUSTOM_SUBTITLES:
- PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles = g_value_dup_string (value);
+ PAROLE_FILE_GET_PRIVATE(file)->custom_subtitles = g_value_dup_string(value);
break;
case PROP_DVD_CHAPTER:
- PAROLE_FILE_GET_PRIVATE (file)->dvd_chapter = g_value_get_int (value);
+ PAROLE_FILE_GET_PRIVATE(file)->dvd_chapter = g_value_get_int(value);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static void
-parole_file_get_property (GObject *object, guint prop_id,
+parole_file_get_property(GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
ParoleFile *file;
- file = PAROLE_FILE (object);
+ file = PAROLE_FILE(object);
switch (prop_id)
{
case PROP_PATH:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->filename);
+ g_value_set_string(value, PAROLE_FILE_GET_PRIVATE(file)->filename);
break;
case PROP_URI:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->filename);
+ g_value_set_string(value, PAROLE_FILE_GET_PRIVATE(file)->filename);
break;
case PROP_CONTENT_TYPE:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->content_type);
+ g_value_set_string(value, PAROLE_FILE_GET_PRIVATE(file)->content_type);
break;
case PROP_DISPLAY_NAME:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->display_name);
+ g_value_set_string(value, PAROLE_FILE_GET_PRIVATE(file)->display_name);
break;
case PROP_DIRECTORY:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->directory);
+ g_value_set_string(value, PAROLE_FILE_GET_PRIVATE(file)->directory);
break;
case PROP_CUSTOM_SUBTITLES:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles);
+ g_value_set_string(value, PAROLE_FILE_GET_PRIVATE(file)->custom_subtitles);
break;
case PROP_DVD_CHAPTER:
- g_value_set_int (value, PAROLE_FILE_GET_PRIVATE (file)->dvd_chapter);
+ g_value_set_int(value, PAROLE_FILE_GET_PRIVATE(file)->dvd_chapter);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static void
-parole_file_constructed (GObject *object)
+parole_file_constructed(GObject *object)
{
GFile *gfile;
GFileInfo *info;
@@ -175,8 +175,8 @@ parole_file_constructed (GObject *object)
gchar *filename;
- file = PAROLE_FILE (object);
- priv = PAROLE_FILE_GET_PRIVATE (file);
+ file = PAROLE_FILE(object);
+ priv = PAROLE_FILE_GET_PRIVATE(file);
filename = g_strdup(priv->filename);
@@ -200,27 +200,27 @@ parole_file_constructed (GObject *object)
g_free(filename);
- gfile = g_file_new_for_commandline_arg (priv->filename);
+ gfile = g_file_new_for_commandline_arg(priv->filename);
- info = g_file_query_info (gfile,
+ info = g_file_query_info(gfile,
"standard::*,",
0,
NULL,
&error);
- priv->directory = g_file_get_path (g_file_get_parent(gfile));
+ priv->directory = g_file_get_path(g_file_get_parent(gfile));
if ( error )
{
- if (G_LIKELY (error->code == G_IO_ERROR_NOT_SUPPORTED)) {
- g_error_free (error);
+ if (G_LIKELY(error->code == G_IO_ERROR_NOT_SUPPORTED)) {
+ g_error_free(error);
if (!priv->display_name)
- priv->display_name = g_file_get_basename (gfile);
+ priv->display_name = g_file_get_basename(gfile);
} else {
if (!priv->display_name)
- priv->display_name = g_strdup (priv->filename);
- g_warning ("Unable to read file info %s", error->message);
+ priv->display_name = g_strdup(priv->filename);
+ g_warning("Unable to read file info %s", error->message);
}
goto out;
}
@@ -232,47 +232,47 @@ parole_file_constructed (GObject *object)
gchar *title;
gchar *title_s;
- tag_file = taglib_file_new (priv->filename);
+ tag_file = taglib_file_new(priv->filename);
if ( tag_file )
{
- tag = taglib_file_tag (tag_file);
+ tag = taglib_file_tag(tag_file);
if ( tag )
{
- title = taglib_tag_title (tag);
+ title = taglib_tag_title(tag);
if ( title )
{
- title_s = g_strstrip (title);
+ title_s = g_strstrip(title);
if ( strlen (title_s ) )
{
- priv->display_name = g_strdup (title_s);
+ priv->display_name = g_strdup(title_s);
}
}
- taglib_tag_free_strings ();
+ taglib_tag_free_strings();
}
- taglib_file_free (tag_file);
+ taglib_file_free(tag_file);
}
}
#endif
if (!priv->display_name)
- priv->display_name = g_strdup (g_file_info_get_display_name (info));
+ priv->display_name = g_strdup(g_file_info_get_display_name(info));
- priv->content_type = g_strdup (g_file_info_get_content_type (info));
+ priv->content_type = g_strdup(g_file_info_get_content_type(info));
- g_object_unref (info);
+ g_object_unref(info);
out:
- priv->uri = g_file_get_uri (gfile);
- g_object_unref (gfile);
+ priv->uri = g_file_get_uri(gfile);
+ g_object_unref(gfile);
}
static void
-parole_file_class_init (ParoleFileClass *klass)
+parole_file_class_init(ParoleFileClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_file_finalize;
@@ -287,9 +287,9 @@ parole_file_class_init (ParoleFileClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_PATH,
- g_param_spec_string ("filename",
+ g_param_spec_string("filename",
"File name",
"The file name",
NULL,
@@ -303,9 +303,9 @@ parole_file_class_init (ParoleFileClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_DISPLAY_NAME,
- g_param_spec_string ("display-name",
+ g_param_spec_string("display-name",
"Display name",
"A UTF-8 name that can be displayed in the UI",
NULL,
@@ -319,9 +319,9 @@ parole_file_class_init (ParoleFileClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_URI,
- g_param_spec_string ("uri",
+ g_param_spec_string("uri",
"Uri",
"The uri of the file",
NULL,
@@ -334,9 +334,9 @@ parole_file_class_init (ParoleFileClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_CONTENT_TYPE,
- g_param_spec_string ("content-type",
+ g_param_spec_string("content-type",
"Content type",
"The content type of the file",
NULL,
@@ -349,9 +349,9 @@ parole_file_class_init (ParoleFileClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_DIRECTORY,
- g_param_spec_string ("directory",
+ g_param_spec_string("directory",
"Parent directory",
"The parent directory of the file",
NULL,
@@ -365,9 +365,9 @@ parole_file_class_init (ParoleFileClass *klass)
*
* Since: 0.4
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_CUSTOM_SUBTITLES,
- g_param_spec_string ("custom_subtitles",
+ g_param_spec_string("custom_subtitles",
"Custom Subtitles",
"The custom subtitles set by the user",
NULL,
@@ -381,9 +381,9 @@ parole_file_class_init (ParoleFileClass *klass)
*
* Since: 0.4
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_DVD_CHAPTER,
- g_param_spec_int ("dvd-chapter",
+ g_param_spec_int("dvd-chapter",
"DVD Chapter",
"DVD Chapter, used for seeking a DVD using the playlist.",
-1,
@@ -396,11 +396,11 @@ parole_file_class_init (ParoleFileClass *klass)
}
static void
-parole_file_init (ParoleFile *file)
+parole_file_init(ParoleFile *file)
{
ParoleFilePrivate *priv;
- priv = PAROLE_FILE_GET_PRIVATE (file);
+ priv = PAROLE_FILE_GET_PRIVATE(file);
priv->filename = NULL;
priv->display_name = NULL;
@@ -422,10 +422,10 @@ parole_file_init (ParoleFile *file)
* Since: 0.2
**/
ParoleFile *
-parole_file_new (const gchar *filename)
+parole_file_new(const gchar *filename)
{
ParoleFile *file = NULL;
- file = g_object_new (PAROLE_TYPE_FILE, "filename", filename, NULL);
+ file = g_object_new(PAROLE_TYPE_FILE, "filename", filename, NULL);
return file;
}
@@ -440,11 +440,11 @@ parole_file_new (const gchar *filename)
* Since: 0.2
**/
ParoleFile *
-parole_file_new_with_display_name (const gchar *filename, const gchar *display_name)
+parole_file_new_with_display_name(const gchar *filename, const gchar *display_name)
{
ParoleFile *file = NULL;
- file = g_object_new (PAROLE_TYPE_FILE,
+ file = g_object_new(PAROLE_TYPE_FILE,
"filename", filename,
"display-name", display_name,
NULL);
@@ -463,12 +463,12 @@ parole_file_new_with_display_name (const gchar *filename, const gchar *display_n
* Since: 0.4
**/
ParoleFile *
-parole_file_new_cdda_track (const gint track_num, const gchar *display_name)
+parole_file_new_cdda_track(const gint track_num, const gchar *display_name)
{
ParoleFile *file = NULL;
gchar *uri = g_strdup_printf("cdda://%i", track_num);
- file = g_object_new (PAROLE_TYPE_FILE,
+ file = g_object_new(PAROLE_TYPE_FILE,
"filename", uri,
"display-name", display_name,
NULL);
@@ -488,12 +488,12 @@ parole_file_new_cdda_track (const gint track_num, const gchar *display_name)
* Since: 0.4
**/
ParoleFile *
-parole_file_new_dvd_chapter (gint chapter_num, const gchar *display_name)
+parole_file_new_dvd_chapter(gint chapter_num, const gchar *display_name)
{
ParoleFile *file = NULL;
gchar *uri = "dvd:/";
- file = g_object_new (PAROLE_TYPE_FILE,
+ file = g_object_new(PAROLE_TYPE_FILE,
"filename", uri,
"display-name", display_name,
"dvd-chapter", chapter_num,
@@ -513,9 +513,9 @@ parole_file_new_dvd_chapter (gint chapter_num, const gchar *display_name)
* Since: 0.2
**/
const gchar *
-parole_file_get_file_name (const ParoleFile *file)
+parole_file_get_file_name(const ParoleFile *file)
{
- g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
+ g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->filename;
}
@@ -530,9 +530,9 @@ parole_file_get_file_name (const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_display_name (const ParoleFile *file)
+parole_file_get_display_name(const ParoleFile *file)
{
- g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
+ g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->display_name;
}
@@ -547,9 +547,9 @@ parole_file_get_display_name (const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_uri (const ParoleFile *file)
+parole_file_get_uri(const ParoleFile *file)
{
- g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
+ g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->uri;
}
@@ -564,9 +564,9 @@ parole_file_get_uri (const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_content_type (const ParoleFile *file)
+parole_file_get_content_type(const ParoleFile *file)
{
- g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
+ g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->content_type;
}
@@ -581,9 +581,9 @@ parole_file_get_content_type (const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_directory (const ParoleFile *file)
+parole_file_get_directory(const ParoleFile *file)
{
- g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
+ g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->directory;
}
@@ -598,22 +598,22 @@ parole_file_get_directory (const ParoleFile *file)
* Since: 0.4
**/
const gchar *
-parole_file_get_custom_subtitles (const ParoleFile *file)
+parole_file_get_custom_subtitles(const ParoleFile *file)
{
- g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
+ g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles;
}
void
-parole_file_set_custom_subtitles (const ParoleFile *file, gchar *suburi)
+parole_file_set_custom_subtitles(const ParoleFile *file, gchar *suburi)
{
GValue value = G_VALUE_INIT;
- g_value_init (&value, G_TYPE_STRING);
- g_value_set_static_string (&value, suburi);
+ g_value_init(&value, G_TYPE_STRING);
+ g_value_set_static_string(&value, suburi);
- parole_file_set_property (G_OBJECT(file), PROP_CUSTOM_SUBTITLES,
- &value, g_param_spec_string ("custom_subtitles",
+ parole_file_set_property(G_OBJECT(file), PROP_CUSTOM_SUBTITLES,
+ &value, g_param_spec_string("custom_subtitles",
"Custom Subtitles",
"The custom subtitles set by the user",
NULL,
@@ -631,7 +631,7 @@ parole_file_set_custom_subtitles (const ParoleFile *file, gchar *suburi)
* Since: 0.4
**/
gint
-parole_file_get_dvd_chapter (const ParoleFile *file)
+parole_file_get_dvd_chapter(const ParoleFile *file)
{
// g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
@@ -639,14 +639,14 @@ parole_file_get_dvd_chapter (const ParoleFile *file)
}
void
-parole_file_set_dvd_chapter (const ParoleFile *file, gint dvd_chapter)
+parole_file_set_dvd_chapter(const ParoleFile *file, gint dvd_chapter)
{
GValue value = G_VALUE_INIT;
- g_value_init (&value, G_TYPE_INT);
- g_value_set_int (&value, dvd_chapter);
+ g_value_init(&value, G_TYPE_INT);
+ g_value_set_int(&value, dvd_chapter);
- parole_file_set_property (G_OBJECT(file), PROP_DVD_CHAPTER,
- &value, g_param_spec_int ("dvd-chapter",
+ parole_file_set_property(G_OBJECT(file), PROP_DVD_CHAPTER,
+ &value, g_param_spec_int("dvd-chapter",
"DVD Chapter",
"DVD Chapter, used for seeking a DVD using the playlist.",
-1,
diff --git a/src/misc/parole-filters.c b/src/misc/parole-filters.c
index 72b7809..eea784d 100644
--- a/src/misc/parole-filters.c
+++ b/src/misc/parole-filters.c
@@ -54,17 +54,17 @@ static char *playlist_file_extensions[] = {
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_audio_filter (void)
+GtkFileFilter *parole_get_supported_audio_filter(void)
{
GtkFileFilter *filter;
guint i;
- filter = gtk_file_filter_new ();
+ filter = gtk_file_filter_new();
- gtk_file_filter_set_name (filter, _("Audio"));
+ gtk_file_filter_set_name(filter, _("Audio"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
+ gtk_file_filter_add_mime_type(filter, audio_mime_types[i]);
return filter;
}
@@ -80,17 +80,17 @@ GtkFileFilter *parole_get_supported_audio_filter (void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_video_filter (void)
+GtkFileFilter *parole_get_supported_video_filter(void)
{
GtkFileFilter *filter;
guint i;
- filter = gtk_file_filter_new ();
+ filter = gtk_file_filter_new();
- gtk_file_filter_set_name (filter, _("Video"));
+ gtk_file_filter_set_name(filter, _("Video"));
for ( i = 0; i < G_N_ELEMENTS (video_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, video_mime_types[i]);
+ gtk_file_filter_add_mime_type(filter, video_mime_types[i]);
return filter;
}
@@ -105,38 +105,38 @@ GtkFileFilter *parole_get_supported_video_filter (void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_media_filter (void)
+GtkFileFilter *parole_get_supported_media_filter(void)
{
GtkFileFilter *filter;
guint i;
- filter = gtk_file_filter_new ();
+ filter = gtk_file_filter_new();
- gtk_file_filter_set_name (filter, _("Audio and video"));
+ gtk_file_filter_set_name(filter, _("Audio and video"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
+ gtk_file_filter_add_mime_type(filter, audio_mime_types[i]);
for ( i = 0; i < G_N_ELEMENTS (video_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, video_mime_types[i]);
+ gtk_file_filter_add_mime_type(filter, video_mime_types[i]);
return filter;
}
-GtkRecentFilter *parole_get_supported_recent_media_filter (void)
+GtkRecentFilter *parole_get_supported_recent_media_filter(void)
{
GtkRecentFilter *filter;
guint i;
- filter = gtk_recent_filter_new ();
+ filter = gtk_recent_filter_new();
- gtk_recent_filter_set_name (filter, _("Audio and video"));
+ gtk_recent_filter_set_name(filter, _("Audio and video"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
- gtk_recent_filter_add_mime_type (filter, audio_mime_types[i]);
+ gtk_recent_filter_add_mime_type(filter, audio_mime_types[i]);
for ( i = 0; i < G_N_ELEMENTS (video_mime_types); i++)
- gtk_recent_filter_add_mime_type (filter, video_mime_types[i]);
+ gtk_recent_filter_add_mime_type(filter, video_mime_types[i]);
return filter;
}
@@ -152,32 +152,32 @@ GtkRecentFilter *parole_get_supported_recent_media_filter (void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_files_filter (void)
+GtkFileFilter *parole_get_supported_files_filter(void)
{
GtkFileFilter *filter;
guint i;
- filter = parole_get_supported_media_filter ();
+ filter = parole_get_supported_media_filter();
- gtk_file_filter_set_name (filter, _("All supported files"));
+ gtk_file_filter_set_name(filter, _("All supported files"));
for ( i = 0; i < G_N_ELEMENTS (playlist_file_extensions); i++)
- gtk_file_filter_add_pattern (filter, playlist_file_extensions[i]);
+ gtk_file_filter_add_pattern(filter, playlist_file_extensions[i]);
return filter;
}
-GtkRecentFilter *parole_get_supported_recent_files_filter (void)
+GtkRecentFilter *parole_get_supported_recent_files_filter(void)
{
GtkRecentFilter *filter;
guint i;
- filter = parole_get_supported_recent_media_filter ();
+ filter = parole_get_supported_recent_media_filter();
- gtk_recent_filter_set_name (filter, _("All supported files"));
+ gtk_recent_filter_set_name(filter, _("All supported files"));
for ( i = 0; i < G_N_ELEMENTS (playlist_file_extensions); i++)
- gtk_recent_filter_add_pattern (filter, playlist_file_extensions[i]);
+ gtk_recent_filter_add_pattern(filter, playlist_file_extensions[i]);
return filter;
}
@@ -193,17 +193,17 @@ GtkRecentFilter *parole_get_supported_recent_files_filter (void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_playlist_filter (void)
+GtkFileFilter *parole_get_supported_playlist_filter(void)
{
GtkFileFilter *filter;
guint i;
- filter = gtk_file_filter_new ();
+ filter = gtk_file_filter_new();
- gtk_file_filter_set_name (filter, _("Playlist files"));
+ gtk_file_filter_set_name(filter, _("Playlist files"));
for ( i = 0; i < G_N_ELEMENTS (playlist_file_extensions); i++)
- gtk_file_filter_add_pattern (filter, playlist_file_extensions[i]);
+ gtk_file_filter_add_pattern(filter, playlist_file_extensions[i]);
return filter;
}
@@ -219,18 +219,18 @@ GtkFileFilter *parole_get_supported_playlist_filter (void)
*
* Since: 0.2
*/
-gboolean parole_file_filter (GtkFileFilter *filter, ParoleFile *file)
+gboolean parole_file_filter(GtkFileFilter *filter, ParoleFile *file)
{
GtkFileFilterInfo filter_info;
gboolean ret;
- filter_info.display_name = parole_file_get_display_name (file);
- filter_info.mime_type = parole_file_get_content_type (file);
+ filter_info.display_name = parole_file_get_display_name(file);
+ filter_info.mime_type = parole_file_get_content_type(file);
filter_info.contains = GTK_FILE_FILTER_DISPLAY_NAME | GTK_FILE_FILTER_MIME_TYPE;
- ret = gtk_file_filter_filter (filter, &filter_info);
+ ret = gtk_file_filter_filter(filter, &filter_info);
return ret;
}
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index dfe6ed9..ac34142 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -58,7 +58,7 @@ typedef struct
gchar *title;
} ParoleParserData;
-gchar *g_substr (const gchar* string, gint start, gint end);
+gchar *g_substr(const gchar* string, gint start, gint end);
static gchar*
parole_filename_to_utf8(const gchar* filename)
@@ -75,7 +75,7 @@ parole_filename_to_utf8(const gchar* filename)
}
static void
-parole_xspf_xml_start (GMarkupParseContext *context, const gchar *element_name,
+parole_xspf_xml_start(GMarkupParseContext *context, const gchar *element_name,
const gchar **attribute_names, const gchar **attribute_values,
gpointer user_data, GError **error)
{
@@ -89,7 +89,7 @@ parole_xspf_xml_start (GMarkupParseContext *context, const gchar *element_name,
}
static void
-parole_xspf_xml_text (GMarkupParseContext *context, const gchar *text, gsize text_len,
+parole_xspf_xml_text(GMarkupParseContext *context, const gchar *text, gsize text_len,
gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
@@ -98,29 +98,29 @@ parole_xspf_xml_text (GMarkupParseContext *context, const gchar *text, gsize tex
if (!data->started)
return;
- element_name = g_markup_parse_context_get_element (context);
+ element_name = g_markup_parse_context_get_element(context);
- if (!g_ascii_strcasecmp (element_name, "location")) {
+ if (!g_ascii_strcasecmp(element_name, "location")) {
if (data->uri) {
- g_free (data->uri);
+ g_free(data->uri);
data->uri = NULL;
}
if (text_len > 0)
- data->uri = g_strdup (text);
- } else if (!g_ascii_strcasecmp (element_name, "title")) {
+ data->uri = g_strdup(text);
+ } else if (!g_ascii_strcasecmp(element_name, "title")) {
if (data->title) {
- g_free (data->title);
+ g_free(data->title);
data->title = NULL;
}
if (text_len > 0)
- data->title = g_strdup (text);
+ data->title = g_strdup(text);
}
}
static void
-parole_xspf_xml_end (GMarkupParseContext *context, const gchar *element_name,
+parole_xspf_xml_end(GMarkupParseContext *context, const gchar *element_name,
gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
@@ -136,23 +136,23 @@ parole_xspf_xml_end (GMarkupParseContext *context, const gchar *element_name,
{
if (data->uri)
{
- file = parole_file_new_with_display_name (data->uri, data->title);
- data->list = g_slist_append (data->list, file);
+ file = parole_file_new_with_display_name(data->uri, data->title);
+ data->list = g_slist_append(data->list, file);
- g_free (data->uri);
+ g_free(data->uri);
data->uri = NULL;
}
if ( data->title)
{
- g_free (data->title);
+ g_free(data->title);
data->title = NULL;
}
}
}
static void
-parole_asx_xml_start (GMarkupParseContext *context, const gchar *element_name,
+parole_asx_xml_start(GMarkupParseContext *context, const gchar *element_name,
const gchar **attribute_names, const gchar **attribute_values,
gpointer user_data, GError **error)
{
@@ -171,7 +171,7 @@ parole_asx_xml_start (GMarkupParseContext *context, const gchar *element_name,
{
if (data->uri)
{
- g_free (data->uri);
+ g_free(data->uri);
data->uri = NULL;
}
@@ -179,7 +179,7 @@ parole_asx_xml_start (GMarkupParseContext *context, const gchar *element_name,
{
if ( !g_ascii_strcasecmp (attribute_names[i], "href"))
{
- data->uri = g_strdup (attribute_values[i]);
+ data->uri = g_strdup(attribute_values[i]);
break;
}
}
@@ -187,7 +187,7 @@ parole_asx_xml_start (GMarkupParseContext *context, const gchar *element_name,
}
static void
-parole_asx_xml_text (GMarkupParseContext *context, const gchar *text, gsize text_len,
+parole_asx_xml_text(GMarkupParseContext *context, const gchar *text, gsize text_len,
gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
@@ -196,23 +196,23 @@ parole_asx_xml_text (GMarkupParseContext *context, const gchar *text, gsize text
if (!data->started)
return;
- element_name = g_markup_parse_context_get_element (context);
+ element_name = g_markup_parse_context_get_element(context);
if (!g_ascii_strcasecmp (element_name, "title") )
{
if (data->title)
{
- g_free (data->title);
+ g_free(data->title);
data->title = NULL;
}
if (text_len > 0)
- data->title = g_strdup (text);
+ data->title = g_strdup(text);
}
}
static void
-parole_asx_xml_end (GMarkupParseContext *context, const gchar *element_name,
+parole_asx_xml_end(GMarkupParseContext *context, const gchar *element_name,
gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
@@ -228,23 +228,23 @@ parole_asx_xml_end (GMarkupParseContext *context, const gchar *element_name,
{
if (data->uri)
{
- file = parole_file_new_with_display_name (data->uri, data->title);
- data->list = g_slist_append (data->list, file);
+ file = parole_file_new_with_display_name(data->uri, data->title);
+ data->list = g_slist_append(data->list, file);
- g_free (data->uri);
+ g_free(data->uri);
data->uri = NULL;
}
if ( data->title)
{
- g_free (data->title);
+ g_free(data->title);
data->title = NULL;
}
}
}
static GSList *
-parole_pl_parser_parse_asx (const gchar *filename)
+parole_pl_parser_parse_asx(const gchar *filename)
{
ParoleParserData data;
GFile *file;
@@ -263,53 +263,53 @@ parole_pl_parser_parse_asx (const gchar *filename)
data.list = NULL;
data.title = data.uri = NULL;
- file = g_file_new_for_path (filename);
+ file = g_file_new_for_path(filename);
if (!g_file_load_contents (file, NULL, &contents, &size, NULL, NULL))
goto out;
- if (g_utf8_validate (contents, -1, NULL) == FALSE) {
+ if (g_utf8_validate(contents, -1, NULL) == FALSE) {
gchar *fixed;
- fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
+ fixed = g_convert(contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
if (fixed != NULL) {
- g_free (contents);
+ g_free(contents);
contents = fixed;
}
}
- pctx = g_markup_parse_context_new (&parser, 0, &data, NULL);
+ pctx = g_markup_parse_context_new(&parser, 0, &data, NULL);
- if ( !g_markup_parse_context_parse (pctx, contents, size, &error) ) {
+ if ( !g_markup_parse_context_parse(pctx, contents, size, &error) ) {
if ( error ) {
- g_critical ("Unable to parse asx file : %s : %s\n", filename, error->message);
- g_error_free (error);
+ g_critical("Unable to parse asx file : %s : %s\n", filename, error->message);
+ g_error_free(error);
}
} else {
- if ( !g_markup_parse_context_end_parse (pctx, &error) ) {
- g_critical ("Unable to finish parsing ASX playlist file %s", error->message);
- g_error_free (error);
+ if ( !g_markup_parse_context_end_parse(pctx, &error) ) {
+ g_critical("Unable to finish parsing ASX playlist file %s", error->message);
+ g_error_free(error);
}
}
- g_markup_parse_context_free (pctx);
+ g_markup_parse_context_free(pctx);
out:
- g_object_unref (file);
+ g_object_unref(file);
return data.list;
}
gchar *
-g_substr (const gchar* string,
+g_substr(const gchar* string,
gint start,
gint end)
{
gsize len = (end - start + 1);
- gchar *output = g_malloc0 (len + 1);
+ gchar *output = g_malloc0(len + 1);
return g_utf8_strncpy (output, &string[start], len);
}
static GSList *
-parole_pl_parser_parse_m3u (const gchar *filename)
+parole_pl_parser_parse_m3u(const gchar *filename)
{
GFile *file;
gchar **lines;
@@ -324,34 +324,34 @@ parole_pl_parser_parse_m3u (const gchar *filename)
GRegex *regex;
GMatchInfo *match_info = NULL;
- file = g_file_new_for_path (filename);
+ file = g_file_new_for_path(filename);
path = g_path_get_dirname(filename);
if (!g_file_load_contents (file, NULL, &contents, &size, NULL, NULL))
goto out;
- if (g_utf8_validate (contents, -1, NULL) == FALSE) {
+ if (g_utf8_validate(contents, -1, NULL) == FALSE) {
gchar *fixed;
- fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
+ fixed = g_convert(contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
if (fixed != NULL) {
- g_free (contents);
+ g_free(contents);
contents = fixed;
}
}
- if (strstr (contents, "\x0d") == NULL) {
+ if (strstr(contents, "\x0d") == NULL) {
split_char = "\n";
} else {
split_char = "\x0d\n";
}
- lines = g_strsplit (contents, split_char, 0);
- g_free (contents);
+ lines = g_strsplit(contents, split_char, 0);
+ g_free(contents);
// Regular expression for stream protocols, such as http:// and smb://
- regex = g_regex_new ("^(?!/)[a-zA-Z_0-9]+://", 0, 0, NULL);
+ regex = g_regex_new("^(?!/)[a-zA-Z_0-9]+://", 0, 0, NULL);
- num_lines = g_strv_length (lines);
+ num_lines = g_strv_length(lines);
num_lines--; /* Drop the terminating NULL */
for (i = 0; lines[i] != NULL; i++) {
@@ -363,7 +363,7 @@ parole_pl_parser_parse_m3u (const gchar *filename)
pl_filename = g_strdup(lines[i]);
} else {
/* Stream protocol */
- if ( g_regex_match (regex, lines[i], 0, &match_info) ) {
+ if ( g_regex_match(regex, lines[i], 0, &match_info) ) {
pl_filename = g_strdup(lines[i]);
} else {
/* Relative path */
@@ -371,23 +371,23 @@ parole_pl_parser_parse_m3u (const gchar *filename)
}
}
- list = g_slist_append (list, parole_file_new (pl_filename));
+ list = g_slist_append(list, parole_file_new(pl_filename));
}
if (pl_filename)
g_free(pl_filename);
- g_strfreev (lines);
+ g_strfreev(lines);
- g_match_info_free (match_info);
- g_regex_unref (regex);
+ g_match_info_free(match_info);
+ g_regex_unref(regex);
out:
- g_object_unref (file);
+ g_object_unref(file);
return list;
}
static GSList *
-parole_pl_parser_parse_pls (const gchar *filename)
+parole_pl_parser_parse_pls(const gchar *filename)
{
XfceRc *rcfile;
GSList *list = NULL;
@@ -396,39 +396,39 @@ parole_pl_parser_parse_pls (const gchar *filename)
guint i, nentries;
gchar key[128];
- rcfile = xfce_rc_simple_open (filename, TRUE);
+ rcfile = xfce_rc_simple_open(filename, TRUE);
if ( xfce_rc_has_group (rcfile, "playlist") )
{
- xfce_rc_set_group (rcfile, "playlist");
+ xfce_rc_set_group(rcfile, "playlist");
- nentries = xfce_rc_read_int_entry (rcfile, "NumberOfEntries", 0);
+ nentries = xfce_rc_read_int_entry(rcfile, "NumberOfEntries", 0);
for (i = 1; i <= nentries; i++)
{
- g_snprintf (key, 128, "File%d", i);
+ g_snprintf(key, 128, "File%d", i);
- file_entry = xfce_rc_read_entry (rcfile, key, NULL);
+ file_entry = xfce_rc_read_entry(rcfile, key, NULL);
if (!file_entry)
continue;
- g_snprintf (key, 128, "Title%d", i);
+ g_snprintf(key, 128, "Title%d", i);
- title_entry = xfce_rc_read_entry (rcfile, key, NULL);
+ title_entry = xfce_rc_read_entry(rcfile, key, NULL);
- file = parole_file_new_with_display_name (file_entry, title_entry);
- list = g_slist_append (list, file);
+ file = parole_file_new_with_display_name(file_entry, title_entry);
+ list = g_slist_append(list, file);
}
}
- xfce_rc_close (rcfile);
+ xfce_rc_close(rcfile);
return list;
}
static GSList *
-parole_pl_parser_parse_xspf (const gchar *filename)
+parole_pl_parser_parse_xspf(const gchar *filename)
{
ParoleParserData data;
GFile *file;
@@ -447,7 +447,7 @@ parole_pl_parser_parse_xspf (const gchar *filename)
data.list = NULL;
data.title = data.uri = NULL;
- file = g_file_new_for_path (filename);
+ file = g_file_new_for_path(filename);
if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) )
goto out;
@@ -455,53 +455,53 @@ parole_pl_parser_parse_xspf (const gchar *filename)
if ( g_utf8_validate (contents, -1, NULL) == FALSE)
{
gchar *fixed;
- fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
+ fixed = g_convert(contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
if (fixed != NULL)
{
- g_free (contents);
+ g_free(contents);
contents = fixed;
}
}
- pctx = g_markup_parse_context_new (&parser, 0, &data, NULL);
+ pctx = g_markup_parse_context_new(&parser, 0, &data, NULL);
- if ( !g_markup_parse_context_parse (pctx, contents, size, &error) ) {
+ if ( !g_markup_parse_context_parse(pctx, contents, size, &error) ) {
if ( error ) {
- g_critical ("Unable to parse xspf file : %s : %s\n", filename, error->message);
- g_error_free (error);
+ g_critical("Unable to parse xspf file : %s : %s\n", filename, error->message);
+ g_error_free(error);
}
} else {
- if ( !g_markup_parse_context_end_parse (pctx, &error) ) {
- g_critical ("Unable to finish parsing xspf playlist file %s", error->message);
- g_error_free (error);
+ if ( !g_markup_parse_context_end_parse(pctx, &error) ) {
+ g_critical("Unable to finish parsing xspf playlist file %s", error->message);
+ g_error_free(error);
}
}
- g_markup_parse_context_free (pctx);
+ g_markup_parse_context_free(pctx);
out:
- g_object_unref (file);
+ g_object_unref(file);
return data.list;
}
static GSList *
-parole_pl_parser_parse (ParolePlFormat format, const gchar *filename)
+parole_pl_parser_parse(ParolePlFormat format, const gchar *filename)
{
GSList *list = NULL;
switch (format)
{
case PAROLE_PL_FORMAT_M3U:
- list = parole_pl_parser_parse_m3u (filename);
+ list = parole_pl_parser_parse_m3u(filename);
break;
case PAROLE_PL_FORMAT_PLS:
- list = parole_pl_parser_parse_pls (filename);
+ list = parole_pl_parser_parse_pls(filename);
break;
case PAROLE_PL_FORMAT_ASX:
- list = parole_pl_parser_parse_asx (filename);
+ list = parole_pl_parser_parse_asx(filename);
break;
case PAROLE_PL_FORMAT_XSPF:
- list = parole_pl_parser_parse_xspf (filename);
+ list = parole_pl_parser_parse_xspf(filename);
break;
default:
break;
@@ -511,7 +511,7 @@ parole_pl_parser_parse (ParolePlFormat format, const gchar *filename)
}
static gboolean
-parole_pl_parser_save_m3u (FILE *f, GSList *files)
+parole_pl_parser_save_m3u(FILE *f, GSList *files)
{
guint len;
guint i;
@@ -519,21 +519,21 @@ parole_pl_parser_save_m3u (FILE *f, GSList *files)
gchar *display_name = NULL;
gchar *file_name = NULL;
- fputs ("#EXTM3U\n\n", f);
+ fputs("#EXTM3U\n\n", f);
- len = g_slist_length (files);
+ len = g_slist_length(files);
for ( i = 0; i < len; i++)
{
ParoleFile *file;
- file = g_slist_nth_data (files, i);
- display_name = g_strdup(parole_file_get_display_name (file));
- file_name = parole_filename_to_utf8(parole_file_get_file_name (file));
+ file = g_slist_nth_data(files, i);
+ display_name = g_strdup(parole_file_get_display_name(file));
+ file_name = parole_filename_to_utf8(parole_file_get_file_name(file));
if (display_name && file_name)
{
- fprintf (f, "#EXTINF:-1,%s\n", display_name);
- fprintf (f, "%s\n\n", file_name);
+ fprintf(f, "#EXTINF:-1,%s\n", display_name);
+ fprintf(f, "%s\n\n", file_name);
}
}
@@ -547,76 +547,76 @@ parole_pl_parser_save_m3u (FILE *f, GSList *files)
}
static gboolean
-parole_pl_parser_save_pls (FILE *f, GSList *files)
+parole_pl_parser_save_pls(FILE *f, GSList *files)
{
guint len;
guint i;
gchar key[128];
- len = g_slist_length (files);
+ len = g_slist_length(files);
- fprintf (f, "[playlist]\nNumberOfEntries=%d\n", len);
+ fprintf(f, "[playlist]\nNumberOfEntries=%d\n", len);
for ( i = 1; i <= len; i++)
{
ParoleFile *file;
- file = g_slist_nth_data (files, i - 1);
- g_snprintf (key, 128, "File%d", i);
- fprintf (f, "%s=%s\n", key, parole_filename_to_utf8(parole_file_get_file_name (file)));
- g_snprintf (key, 128, "Title%d", i);
- fprintf (f, "%s=%s\n\n", key, parole_file_get_display_name (file));
+ file = g_slist_nth_data(files, i - 1);
+ g_snprintf(key, 128, "File%d", i);
+ fprintf(f, "%s=%s\n", key, parole_filename_to_utf8(parole_file_get_file_name(file)));
+ g_snprintf(key, 128, "Title%d", i);
+ fprintf(f, "%s=%s\n\n", key, parole_file_get_display_name(file));
}
return TRUE;
}
static gboolean
-parole_pl_parser_save_asx (FILE *f, GSList *files)
+parole_pl_parser_save_asx(FILE *f, GSList *files)
{
guint len;
guint i;
- len = g_slist_length (files);
+ len = g_slist_length(files);
- fputs ("<ASX VERSION=\"3.0\">\n", f);
+ fputs("<ASX VERSION=\"3.0\">\n", f);
for ( i = 0; i < len; i++)
{
ParoleFile *file;
- file = g_slist_nth_data (files, i);
- fprintf (f, " <ENTRY>\n <TITLE>%s</TITLE>\n <REF HREF=\"%s\"/>\n </ENTRY>\n",
- parole_file_get_display_name (file),
- parole_file_get_uri (file));
+ file = g_slist_nth_data(files, i);
+ fprintf(f, " <ENTRY>\n <TITLE>%s</TITLE>\n <REF HREF=\"%s\"/>\n </ENTRY>\n",
+ parole_file_get_display_name(file),
+ parole_file_get_uri(file));
}
- fputs ("</ASX>\n", f);
+ fputs("</ASX>\n", f);
return TRUE;
}
static gboolean
-parole_pl_parser_save_xspf (FILE *f, GSList *files)
+parole_pl_parser_save_xspf(FILE *f, GSList *files)
{
guint len;
guint i;
- len = g_slist_length (files);
+ len = g_slist_length(files);
- fputs ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n", f);
- fputs (" <trackList>\n", f);
+ fputs(" <trackList>\n", f);
for ( i = 0; i < len; i++)
{
ParoleFile *file;
- file = g_slist_nth_data (files, i);
- fprintf (f, " <track>\n <title>%s</title>\n <location>%s</location>\n </track>\n",
- parole_file_get_display_name (file), parole_file_get_uri (file));
+ file = g_slist_nth_data(files, i);
+ fprintf(f, " <track>\n <title>%s</title>\n <location>%s</location>\n </track>\n",
+ parole_file_get_display_name(file), parole_file_get_uri(file));
}
- fputs (" </trackList>\n<playlist>", f);
+ fputs(" </trackList>\n<playlist>", f);
return TRUE;
}
@@ -633,7 +633,7 @@ parole_pl_parser_save_xspf (FILE *f, GSList *files)
* Since: 0.2
*/
ParolePlFormat
-parole_pl_parser_guess_format_from_extension (const gchar *filename)
+parole_pl_parser_guess_format_from_extension(const gchar *filename)
{
if ( g_str_has_suffix (filename, ".m3u") || g_str_has_suffix (filename, ".M3U") )
return PAROLE_PL_FORMAT_M3U;
@@ -665,7 +665,7 @@ parole_pl_parser_guess_format_from_extension (const gchar *filename)
* Since: 0.2
*/
ParolePlFormat
-parole_pl_parser_guess_format_from_data (const gchar *filename)
+parole_pl_parser_guess_format_from_data(const gchar *filename)
{
GFile *file;
gchar *contents = NULL;
@@ -673,11 +673,11 @@ parole_pl_parser_guess_format_from_data (const gchar *filename)
ParolePlFormat format = PAROLE_PL_FORMAT_UNKNOWN;
- file = g_file_new_for_path (filename);
+ file = g_file_new_for_path(filename);
if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL ) )
{
- g_debug ("Unable to load content of file=%s", filename);
+ g_debug("Unable to load content of file=%s", filename);
goto out;
}
@@ -691,9 +691,9 @@ parole_pl_parser_guess_format_from_data (const gchar *filename)
/* try to load the file as M3U*/
format = PAROLE_PL_FORMAT_M3U;
- g_free (contents);
+ g_free(contents);
out:
- g_object_unref (file);
+ g_object_unref(file);
return format;
}
@@ -710,34 +710,34 @@ out:
*
* Since: 0.2
**/
-gboolean parole_pl_parser_save_from_files (GSList *files, const gchar *filename, ParolePlFormat format)
+gboolean parole_pl_parser_save_from_files(GSList *files, const gchar *filename, ParolePlFormat format)
{
FILE *f;
gboolean ret_val = FALSE;
- PAROLE_DEBUG_ENUM_FULL (format, PAROLE_ENUM_TYPE_PL_FORMAT, "Saving playlist %s ", filename);
+ PAROLE_DEBUG_ENUM_FULL(format, PAROLE_ENUM_TYPE_PL_FORMAT, "Saving playlist %s ", filename);
- f = fopen (filename, "w");
+ f = fopen(filename, "w");
switch (format)
{
case PAROLE_PL_FORMAT_M3U:
- ret_val = parole_pl_parser_save_m3u (f, files);
+ ret_val = parole_pl_parser_save_m3u(f, files);
break;
case PAROLE_PL_FORMAT_PLS:
- ret_val = parole_pl_parser_save_pls (f, files);
+ ret_val = parole_pl_parser_save_pls(f, files);
break;
case PAROLE_PL_FORMAT_ASX:
- ret_val = parole_pl_parser_save_asx (f, files);
+ ret_val = parole_pl_parser_save_asx(f, files);
break;
case PAROLE_PL_FORMAT_XSPF:
- ret_val = parole_pl_parser_save_xspf (f, files);
+ ret_val = parole_pl_parser_save_xspf(f, files);
break;
default:
break;
}
- fclose (f);
+ fclose(f);
return ret_val;
}
@@ -752,20 +752,20 @@ gboolean parole_pl_parser_save_from_files (GSList *files, const gchar *filename,
*
* Since: 0.2
*/
-GSList *parole_pl_parser_parse_from_file_by_extension (const gchar *filename)
+GSList *parole_pl_parser_parse_from_file_by_extension(const gchar *filename)
{
ParolePlFormat format = PAROLE_PL_FORMAT_UNKNOWN;
GSList *list = NULL;
if ( (format = parole_pl_parser_guess_format_from_extension (filename)) == PAROLE_PL_FORMAT_UNKNOWN &&
- (format = parole_pl_parser_guess_format_from_data (filename)) == PAROLE_PL_FORMAT_UNKNOWN )
+(format = parole_pl_parser_guess_format_from_data(filename)) == PAROLE_PL_FORMAT_UNKNOWN )
{
- g_debug ("Unable to guess playlist format : %s", filename);
+ g_debug("Unable to guess playlist format : %s", filename);
goto out;
}
- PAROLE_DEBUG_ENUM_FULL (format, PAROLE_ENUM_TYPE_PL_FORMAT, "playlist %s ", filename);
- list = parole_pl_parser_parse (format, filename);
+ PAROLE_DEBUG_ENUM_FULL(format, PAROLE_ENUM_TYPE_PL_FORMAT, "playlist %s ", filename);
+ list = parole_pl_parser_parse(format, filename);
out:
return list;
@@ -783,14 +783,14 @@ out:
*
* Since: 0.2
*/
-GSList *parole_pl_parser_parse_all_from_file (const gchar *filename)
+GSList *parole_pl_parser_parse_all_from_file(const gchar *filename)
{
GSList *list = NULL;
- list = parole_pl_parser_parse_asx (filename);
- list = g_slist_concat (list, parole_pl_parser_parse_m3u (filename));
- list = g_slist_concat (list, parole_pl_parser_parse_pls (filename));
- list = g_slist_concat (list, parole_pl_parser_parse_xspf (filename));
+ list = parole_pl_parser_parse_asx(filename);
+ list = g_slist_concat(list, parole_pl_parser_parse_m3u(filename));
+ list = g_slist_concat(list, parole_pl_parser_parse_pls(filename));
+ list = g_slist_concat(list, parole_pl_parser_parse_xspf(filename));
return list;
}
@@ -806,26 +806,26 @@ GSList *parole_pl_parser_parse_all_from_file (const gchar *filename)
*
* Since: 0.2
*/
-gboolean parole_pl_parser_can_parse_data (const guchar *data, gint len)
+gboolean parole_pl_parser_can_parse_data(const guchar *data, gint len)
{
gchar *mime_type = NULL;
gboolean result_uncertain;
gboolean result = FALSE;
- mime_type = g_content_type_guess (NULL, data, len, &result_uncertain);
+ mime_type = g_content_type_guess(NULL, data, len, &result_uncertain);
if ( mime_type && result_uncertain == FALSE )
{
- GtkFileFilter *filter = g_object_ref_sink (parole_get_supported_playlist_filter ());
+ GtkFileFilter *filter = g_object_ref_sink(parole_get_supported_playlist_filter());
GtkFileFilterInfo filter_info;
- g_debug ("Mime_type=%s", mime_type);
+ g_debug("Mime_type=%s", mime_type);
filter_info.mime_type = mime_type;
filter_info.contains = GTK_FILE_FILTER_MIME_TYPE;
- result = gtk_file_filter_filter (filter, &filter_info);
- g_object_unref (filter);
- g_free (mime_type);
+ result = gtk_file_filter_filter(filter, &filter_info);
+ g_object_unref(filter);
+ g_free(mime_type);
}
return result;
diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c
index dd2a48d..99f5712 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -28,11 +28,11 @@
#include "parole-marshal.h"
#include "parole-enum-types.h"
-static void parole_provider_player_base_init (gpointer klass);
-static void parole_provider_player_class_init (gpointer klass);
+static void parole_provider_player_base_init(gpointer klass);
+static void parole_provider_player_class_init(gpointer klass);
GType
-parole_provider_player_get_type (void)
+parole_provider_player_get_type(void)
{
static GType type = G_TYPE_INVALID;
@@ -52,15 +52,15 @@ parole_provider_player_get_type (void)
NULL,
};
- type = g_type_register_static (G_TYPE_INTERFACE, "ParoleProviderPlayerIface", &info, 0);
+ type = g_type_register_static(G_TYPE_INTERFACE, "ParoleProviderPlayerIface", &info, 0);
- g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
+ g_type_interface_add_prerequisite(type, G_TYPE_OBJECT);
}
return type;
}
-static void parole_provider_player_base_init (gpointer klass)
+static void parole_provider_player_base_init(gpointer klass)
{
static gboolean initialized = FALSE;
@@ -76,10 +76,10 @@ static void parole_provider_player_base_init (gpointer klass)
*
* Since: 0.2
**/
- g_signal_new ("state-changed",
- G_TYPE_FROM_INTERFACE (klass),
+ g_signal_new("state-changed",
+ G_TYPE_FROM_INTERFACE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleProviderPlayerIface, state_changed),
+ G_STRUCT_OFFSET(ParoleProviderPlayerIface, state_changed),
NULL, NULL,
parole_marshal_VOID__OBJECT_ENUM,
G_TYPE_NONE, 2,
@@ -94,10 +94,10 @@ static void parole_provider_player_base_init (gpointer klass)
*
* Since: 0.2
**/
- g_signal_new ("tag-message",
- G_TYPE_FROM_INTERFACE (klass),
+ g_signal_new("tag-message",
+ G_TYPE_FROM_INTERFACE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleProviderPlayerIface, tag_message),
+ G_STRUCT_OFFSET(ParoleProviderPlayerIface, tag_message),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, PAROLE_TYPE_STREAM);
@@ -111,10 +111,10 @@ static void parole_provider_player_base_init (gpointer klass)
*
* Since: 0.6
**/
- g_signal_new ("seeked",
- G_TYPE_FROM_INTERFACE (klass),
+ g_signal_new("seeked",
+ G_TYPE_FROM_INTERFACE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleProviderPlayerIface, seeked),
+ G_STRUCT_OFFSET(ParoleProviderPlayerIface, seeked),
NULL, NULL,
g_cclosure_marshal_VOID__DOUBLE,
G_TYPE_NONE, 1, G_TYPE_DOUBLE);
@@ -123,7 +123,7 @@ static void parole_provider_player_base_init (gpointer klass)
}
}
-static void parole_provider_player_class_init (gpointer klass)
+static void parole_provider_player_class_init(gpointer klass)
{
}
@@ -138,15 +138,15 @@ static void parole_provider_player_class_init (gpointer klass)
*
* Since: 0.2
**/
-GtkWidget *parole_provider_player_get_main_window (ParoleProviderPlayer *player)
+GtkWidget *parole_provider_player_get_main_window(ParoleProviderPlayer *player)
{
GtkWidget *window = NULL;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), NULL);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_main_window )
{
- window = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_main_window) (player);
+ window =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_main_window)(player);
}
return window;
}
@@ -167,14 +167,14 @@ GtkWidget *parole_provider_player_get_main_window (ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-void parole_provider_player_pack (ParoleProviderPlayer *player, GtkWidget *widget,
+void parole_provider_player_pack(ParoleProviderPlayer *player, GtkWidget *widget,
const gchar *title, ParolePluginContainer container)
{
- g_return_if_fail (PAROLE_IS_PROVIDER_PLAYER (player));
+ g_return_if_fail(PAROLE_IS_PROVIDER_PLAYER(player));
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pack )
{
- (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pack) (player, widget, title, container);
+(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pack)(player, widget, title, container);
}
}
@@ -189,15 +189,15 @@ void parole_provider_player_pack (ParoleProviderPlayer *player, GtkWidget *widge
*
* Since: 0.2
**/
-ParoleState parole_provider_player_get_state (ParoleProviderPlayer *player)
+ParoleState parole_provider_player_get_state(ParoleProviderPlayer *player)
{
ParoleState state = PAROLE_STATE_STOPPED;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), PAROLE_STATE_STOPPED);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), PAROLE_STATE_STOPPED);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_state )
{
- state = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_state) (player);
+ state =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_state)(player);
}
return state;
@@ -213,9 +213,9 @@ ParoleState parole_provider_player_get_state (ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-const ParoleStream *parole_provider_player_get_stream (ParoleProviderPlayer *player)
+const ParoleStream *parole_provider_player_get_stream(ParoleProviderPlayer *player)
{
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), NULL);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
{
@@ -240,15 +240,15 @@ const ParoleStream *parole_provider_player_get_stream (ParoleProviderPlayer *p
*
* Since: 0.2
**/
-gboolean parole_provider_player_play_uri (ParoleProviderPlayer *player, const gchar *uri)
+gboolean parole_provider_player_play_uri(ParoleProviderPlayer *player, const gchar *uri)
{
gboolean ret = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_uri )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_uri) (player, uri);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_uri)(player, uri);
}
return ret;
}
@@ -269,15 +269,15 @@ gboolean parole_provider_player_play_uri (ParoleProviderPlayer *player, const gc
*
* Since: 0.2
**/
-gboolean parole_provider_player_pause (ParoleProviderPlayer *player)
+gboolean parole_provider_player_pause(ParoleProviderPlayer *player)
{
gboolean ret = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pause )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pause) (player);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pause)(player);
}
return ret;
@@ -300,15 +300,15 @@ gboolean parole_provider_player_pause (ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-gboolean parole_provider_player_resume (ParoleProviderPlayer *player)
+gboolean parole_provider_player_resume(ParoleProviderPlayer *player)
{
gboolean ret = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->resume )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->resume) (player);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->resume)(player);
}
return ret;
@@ -328,15 +328,15 @@ gboolean parole_provider_player_resume (ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-gboolean parole_provider_player_stop (ParoleProviderPlayer *player)
+gboolean parole_provider_player_stop(ParoleProviderPlayer *player)
{
gboolean ret = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->stop )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->stop) (player);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->stop)(player);
}
return ret;
@@ -353,15 +353,15 @@ gboolean parole_provider_player_stop (ParoleProviderPlayer *player)
*
* Since: 0.6
**/
-gboolean parole_provider_player_play_previous (ParoleProviderPlayer *player)
+gboolean parole_provider_player_play_previous(ParoleProviderPlayer *player)
{
gboolean ret = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_previous )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_previous) (player);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_previous)(player);
}
return ret;
@@ -378,15 +378,15 @@ gboolean parole_provider_player_play_previous (ParoleProviderPlayer *player)
*
* Since: 0.6
**/
-gboolean parole_provider_player_play_next (ParoleProviderPlayer *player)
+gboolean parole_provider_player_play_next(ParoleProviderPlayer *player)
{
gboolean ret = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_next )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_next) (player);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_next)(player);
}
return ret;
@@ -406,15 +406,15 @@ gboolean parole_provider_player_play_next (ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-gboolean parole_provider_player_seek (ParoleProviderPlayer *player, gdouble pos)
+gboolean parole_provider_player_seek(ParoleProviderPlayer *player, gdouble pos)
{
gboolean ret = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->seek )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->seek) (player, pos);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->seek)(player, pos);
}
return ret;
@@ -432,7 +432,7 @@ gboolean parole_provider_player_seek (ParoleProviderPlayer *player, gdouble pos)
**/
gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer *player)
{
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), 0);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), 0);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream_position )
{
@@ -451,13 +451,13 @@ gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-void parole_provider_player_open_media_chooser (ParoleProviderPlayer *player)
+void parole_provider_player_open_media_chooser(ParoleProviderPlayer *player)
{
- g_return_if_fail (PAROLE_IS_PROVIDER_PLAYER (player));
+ g_return_if_fail(PAROLE_IS_PROVIDER_PLAYER(player));
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->open_media_chooser )
{
- (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->open_media_chooser) (player);
+(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->open_media_chooser)(player);
}
}
@@ -477,11 +477,11 @@ GSimpleAction *parole_provider_player_get_action(ParoleProviderPlayer *player, P
{
GSimpleAction *ret = NULL;;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), NULL);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_action )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_action) (player, action);
+ ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_action)(player, action);
}
return ret;
@@ -499,7 +499,7 @@ GSimpleAction *parole_provider_player_get_action(ParoleProviderPlayer *player, P
**/
gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
{
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_fullscreen )
{
@@ -522,7 +522,7 @@ gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
**/
gboolean parole_provider_player_set_fullscreen(ParoleProviderPlayer *player, gboolean fullscreen)
{
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
{
diff --git a/src/misc/parole-provider-plugin.c b/src/misc/parole-provider-plugin.c
index 3736f7f..36649b3 100644
--- a/src/misc/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -27,7 +27,7 @@
#include "parole-provider-plugin.h"
GType
-parole_provider_plugin_get_type (void)
+parole_provider_plugin_get_type(void)
{
static GType type = G_TYPE_INVALID;
@@ -47,7 +47,7 @@ parole_provider_plugin_get_type (void)
NULL,
};
- type = g_type_register_static (G_TYPE_INTERFACE, "ParoleProviderPlugin", &info, 0);
+ type = g_type_register_static(G_TYPE_INTERFACE, "ParoleProviderPlugin", &info, 0);
}
return type;
@@ -64,15 +64,15 @@ parole_provider_plugin_get_type (void)
*
* Since: 0.2
**/
-gboolean parole_provider_plugin_get_is_configurable (ParoleProviderPlugin *provider)
+gboolean parole_provider_plugin_get_is_configurable(ParoleProviderPlugin *provider)
{
gboolean configurable = FALSE;
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLUGIN (provider), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLUGIN(provider), FALSE);
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable )
{
- configurable = (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable) (provider);
+ configurable =(*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->get_is_configurable)(provider);
}
return configurable;
@@ -88,13 +88,13 @@ gboolean parole_provider_plugin_get_is_configurable (ParoleProviderPlugin *provi
*
* Since: 0.2
**/
-void parole_provider_plugin_configure (ParoleProviderPlugin *provider, GtkWidget *parent)
+void parole_provider_plugin_configure(ParoleProviderPlugin *provider, GtkWidget *parent)
{
- g_return_if_fail (PAROLE_IS_PROVIDER_PLUGIN (provider));
+ g_return_if_fail(PAROLE_IS_PROVIDER_PLUGIN(provider));
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->configure )
{
- (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->configure) (provider, parent);
+(*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->configure)(provider, parent);
}
}
@@ -108,10 +108,10 @@ void parole_provider_plugin_configure (ParoleProviderPlugin *provider, GtkWidget
*
* Since: 0.2
**/
-void parole_provider_plugin_set_player (ParoleProviderPlugin *provider, ParoleProviderPlayer *player)
+void parole_provider_plugin_set_player(ParoleProviderPlugin *provider, ParoleProviderPlayer *player)
{
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->set_player )
{
- (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->set_player) (provider, player);
+(*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->set_player)(provider, player);
}
}
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 2b988bf..a2db450 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -35,16 +35,16 @@
#include "parole-enum-types.h"
#define PAROLE_STREAM_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_STREAM, ParoleStreamPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_STREAM, ParoleStreamPrivate))
#define PAROLE_STREAM_FREE_STR_PROP(str) \
if ( str ) \
- g_free (str); \
+ g_free(str); \
str = NULL; \
#define PAROLE_STREAM_DUP_GVALUE_STRING(str, value) \
- PAROLE_STREAM_FREE_STR_PROP (str); \
- str = g_value_dup_string (value); \
+ PAROLE_STREAM_FREE_STR_PROP(str); \
+ str = g_value_dup_string(value); \
typedef struct _ParoleStreamPrivate ParoleStreamPrivate;
@@ -108,10 +108,10 @@ enum
PROP_IMAGE_URI
};
-G_DEFINE_TYPE (ParoleStream, parole_stream, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleStream, parole_stream, G_TYPE_OBJECT)
static void
-parole_stream_get_media_type_from_uri (ParoleStream *stream, const gchar *uri)
+parole_stream_get_media_type_from_uri(ParoleStream *stream, const gchar *uri)
{
GValue val = { 0, };
@@ -134,213 +134,213 @@ parole_stream_get_media_type_from_uri (ParoleStream *stream, const gchar *uri)
else
type = PAROLE_MEDIA_TYPE_UNKNOWN;
- g_value_init (&val, PAROLE_ENUM_TYPE_MEDIA_TYPE);
- g_value_set_enum (&val, type);
- g_object_set_property (G_OBJECT (stream), "media-type", &val);
- g_value_unset (&val);
+ g_value_init(&val, PAROLE_ENUM_TYPE_MEDIA_TYPE);
+ g_value_set_enum(&val, type);
+ g_object_set_property(G_OBJECT(stream), "media-type", &val);
+ g_value_unset(&val);
}
-static void parole_stream_set_property (GObject *object,
+static void parole_stream_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
ParoleStream *stream;
- stream = PAROLE_STREAM (object);
+ stream = PAROLE_STREAM(object);
switch (prop_id)
{
case PROP_URI:
{
ParoleStreamPrivate *priv;
- priv = PAROLE_STREAM_GET_PRIVATE (stream);
- priv->uri = g_value_dup_string (value);
- parole_stream_get_media_type_from_uri (stream, priv->uri);
+ priv = PAROLE_STREAM_GET_PRIVATE(stream);
+ priv->uri = g_value_dup_string(value);
+ parole_stream_get_media_type_from_uri(stream, priv->uri);
break;
}
case PROP_IMAGE_URI:
{
- PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = g_value_dup_string (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->image_uri = g_value_dup_string(value);
break;
}
case PROP_SUBTITLES:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->subtitles, value);
+ PAROLE_STREAM_DUP_GVALUE_STRING(PAROLE_STREAM_GET_PRIVATE(stream)->subtitles, value);
break;
case PROP_LIVE:
{
ParoleStreamPrivate *priv;
gboolean maybe_remote;
- priv = PAROLE_STREAM_GET_PRIVATE (stream);
+ priv = PAROLE_STREAM_GET_PRIVATE(stream);
maybe_remote = priv->media_type == PAROLE_MEDIA_TYPE_REMOTE ||
priv->media_type == PAROLE_MEDIA_TYPE_UNKNOWN;
- priv->live = g_value_get_boolean (value) && maybe_remote;
+ priv->live = g_value_get_boolean(value) && maybe_remote;
break;
}
case PROP_MEDIA_TYPE:
- PAROLE_STREAM_GET_PRIVATE (stream)->media_type = g_value_get_enum (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->media_type = g_value_get_enum(value);
break;
case PROP_HAS_AUDIO:
- PAROLE_STREAM_GET_PRIVATE (stream)->has_audio = g_value_get_boolean (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->has_audio = g_value_get_boolean(value);
break;
case PROP_HAS_VIDEO:
- PAROLE_STREAM_GET_PRIVATE (stream)->has_video = g_value_get_boolean (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->has_video = g_value_get_boolean(value);
break;
case PROP_SEEKABLE:
- PAROLE_STREAM_GET_PRIVATE (stream)->seekable = g_value_get_boolean (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->seekable = g_value_get_boolean(value);
break;
case PROP_DISP_PAR_D:
- PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_d = g_value_get_uint (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->disp_par_d = g_value_get_uint(value);
break;
case PROP_DISP_PAR_N:
- PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_n = g_value_get_uint (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->disp_par_n = g_value_get_uint(value);
break;
case PROP_TRACKS:
- PAROLE_STREAM_GET_PRIVATE (stream)->tracks = g_value_get_uint (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->tracks = g_value_get_uint(value);
break;
case PROP_TRACK:
- PAROLE_STREAM_GET_PRIVATE (stream)->track = g_value_get_uint (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->track = g_value_get_uint(value);
break;
case PROP_TAG_AVAILABLE:
- PAROLE_STREAM_GET_PRIVATE (stream)->tag_available = g_value_get_boolean (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->tag_available = g_value_get_boolean(value);
break;
case PROP_DURATION:
- PAROLE_STREAM_GET_PRIVATE (stream)->duration = g_value_get_int64 (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->duration = g_value_get_int64(value);
break;
case PROP_ABSOLUTE_DURATION:
- PAROLE_STREAM_GET_PRIVATE (stream)->absolute_duration = g_value_get_int64 (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->absolute_duration = g_value_get_int64(value);
break;
case PROP_VIDEO_HEIGHT:
- PAROLE_STREAM_GET_PRIVATE (stream)->video_h = g_value_get_int (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->video_h = g_value_get_int(value);
break;
case PROP_VIDEO_WIDTH:
- PAROLE_STREAM_GET_PRIVATE (stream)->video_w = g_value_get_int (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->video_w = g_value_get_int(value);
break;
case PROP_TITLE:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->title, value);
+ PAROLE_STREAM_DUP_GVALUE_STRING(PAROLE_STREAM_GET_PRIVATE(stream)->title, value);
break;
case PROP_ARTIST:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->artist, value);
+ PAROLE_STREAM_DUP_GVALUE_STRING(PAROLE_STREAM_GET_PRIVATE(stream)->artist, value);
break;
case PROP_YEAR:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->year, value);
+ PAROLE_STREAM_DUP_GVALUE_STRING(PAROLE_STREAM_GET_PRIVATE(stream)->year, value);
break;
case PROP_ALBUM:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->album, value);
+ PAROLE_STREAM_DUP_GVALUE_STRING(PAROLE_STREAM_GET_PRIVATE(stream)->album, value);
break;
case PROP_COMMENT:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->comment, value);
+ PAROLE_STREAM_DUP_GVALUE_STRING(PAROLE_STREAM_GET_PRIVATE(stream)->comment, value);
break;
case PROP_GENRE:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->genre, value);
+ PAROLE_STREAM_DUP_GVALUE_STRING(PAROLE_STREAM_GET_PRIVATE(stream)->genre, value);
break;
case PROP_BITRATE:
- PAROLE_STREAM_GET_PRIVATE (stream)->bitrate = g_value_get_uint (value);
+ PAROLE_STREAM_GET_PRIVATE(stream)->bitrate = g_value_get_uint(value);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
-static void parole_stream_get_property (GObject *object,
+static void parole_stream_get_property(GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
ParoleStream *stream;
- stream = PAROLE_STREAM (object);
+ stream = PAROLE_STREAM(object);
switch (prop_id)
{
case PROP_URI:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->uri);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->uri);
break;
case PROP_IMAGE_URI:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->image_uri);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->image_uri);
break;
case PROP_SUBTITLES:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->subtitles);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->subtitles);
break;
case PROP_LIVE:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->live);
+ g_value_set_boolean(value, PAROLE_STREAM_GET_PRIVATE(stream)->live);
break;
case PROP_MEDIA_TYPE:
- g_value_set_enum (value, PAROLE_STREAM_GET_PRIVATE (stream)->media_type);
+ g_value_set_enum(value, PAROLE_STREAM_GET_PRIVATE(stream)->media_type);
break;
case PROP_HAS_AUDIO:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->has_audio);
+ g_value_set_boolean(value, PAROLE_STREAM_GET_PRIVATE(stream)->has_audio);
break;
case PROP_HAS_VIDEO:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->has_video);
+ g_value_set_boolean(value, PAROLE_STREAM_GET_PRIVATE(stream)->has_video);
break;
case PROP_SEEKABLE:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->seekable);
+ g_value_set_boolean(value, PAROLE_STREAM_GET_PRIVATE(stream)->seekable);
break;
case PROP_DISP_PAR_D:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_d);
+ g_value_set_uint(value, PAROLE_STREAM_GET_PRIVATE(stream)->disp_par_d);
break;
case PROP_DISP_PAR_N:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_n);
+ g_value_set_uint(value, PAROLE_STREAM_GET_PRIVATE(stream)->disp_par_n);
break;
case PROP_DURATION:
- g_value_set_int64 (value, PAROLE_STREAM_GET_PRIVATE (stream)->duration);
+ g_value_set_int64(value, PAROLE_STREAM_GET_PRIVATE(stream)->duration);
break;
case PROP_TRACKS:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->tracks);
+ g_value_set_uint(value, PAROLE_STREAM_GET_PRIVATE(stream)->tracks);
break;
case PROP_TRACK:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->track);
+ g_value_set_uint(value, PAROLE_STREAM_GET_PRIVATE(stream)->track);
break;
case PROP_TAG_AVAILABLE:
- g_value_set_double (value, PAROLE_STREAM_GET_PRIVATE (stream)->tag_available);
+ g_value_set_double(value, PAROLE_STREAM_GET_PRIVATE(stream)->tag_available);
break;
case PROP_ABSOLUTE_DURATION:
- g_value_set_int64 (value, PAROLE_STREAM_GET_PRIVATE (stream)->absolute_duration);
+ g_value_set_int64(value, PAROLE_STREAM_GET_PRIVATE(stream)->absolute_duration);
break;
case PROP_VIDEO_HEIGHT:
- g_value_set_int (value, PAROLE_STREAM_GET_PRIVATE (stream)->video_h);
+ g_value_set_int(value, PAROLE_STREAM_GET_PRIVATE(stream)->video_h);
break;
case PROP_VIDEO_WIDTH:
- g_value_set_int (value, PAROLE_STREAM_GET_PRIVATE (stream)->video_w);
+ g_value_set_int(value, PAROLE_STREAM_GET_PRIVATE(stream)->video_w);
break;
case PROP_TITLE:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->title);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->title);
break;
case PROP_ARTIST:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->artist);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->artist);
break;
case PROP_YEAR:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->year);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->year);
break;
case PROP_ALBUM:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->album);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->album);
break;
case PROP_COMMENT:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->comment);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->comment);
break;
case PROP_GENRE:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->genre);
+ g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->genre);
break;
case PROP_BITRATE:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->bitrate);
+ g_value_set_uint(value, PAROLE_STREAM_GET_PRIVATE(stream)->bitrate);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static void
-parole_stream_finalize (GObject *object)
+parole_stream_finalize(GObject *object)
{
ParoleStream *stream;
- stream = PAROLE_STREAM (object);
+ stream = PAROLE_STREAM(object);
- parole_stream_init_properties (stream);
+ parole_stream_init_properties(stream);
- G_OBJECT_CLASS (parole_stream_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_stream_parent_class)->finalize(object);
}
/**
@@ -354,45 +354,45 @@ parole_stream_finalize (GObject *object)
* Since: 0.6
**/
void
-parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf)
+parole_stream_set_image(GObject *object, GdkPixbuf *pixbuf)
{
ParoleStream *stream;
gchar *filename = NULL;
gint fid;
- stream = PAROLE_STREAM (object);
+ stream = PAROLE_STREAM(object);
if ( PAROLE_STREAM_GET_PRIVATE (stream)->image )
- g_object_unref(G_OBJECT(PAROLE_STREAM_GET_PRIVATE (stream)->image));
+ g_object_unref(G_OBJECT(PAROLE_STREAM_GET_PRIVATE(stream)->image));
if (pixbuf) {
- PAROLE_STREAM_GET_PRIVATE (stream)->image = gdk_pixbuf_copy(pixbuf);
+ PAROLE_STREAM_GET_PRIVATE(stream)->image = gdk_pixbuf_copy(pixbuf);
/* Create a jpeg of the artwork for other components to easily access */
- fid = g_file_open_tmp ("parole-art-XXXXXX.jpg", &filename, NULL);
+ fid = g_file_open_tmp("parole-art-XXXXXX.jpg", &filename, NULL);
close(fid);
- gdk_pixbuf_save (pixbuf, filename, "jpeg", NULL, "quality", "100", NULL);
+ gdk_pixbuf_save(pixbuf, filename, "jpeg", NULL, "quality", "100", NULL);
- PAROLE_STREAM_GET_PRIVATE (stream)->previous_image = g_strdup(filename);
- PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = g_strdup_printf("file://%s", filename);
+ PAROLE_STREAM_GET_PRIVATE(stream)->previous_image = g_strdup(filename);
+ PAROLE_STREAM_GET_PRIVATE(stream)->image_uri = g_strdup_printf("file://%s", filename);
g_free(filename);
} else {
- PAROLE_STREAM_GET_PRIVATE (stream)->image = NULL;
- PAROLE_STREAM_GET_PRIVATE (stream)->previous_image = NULL;
- PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = g_strdup_printf ("file://%s/no-cover.png", PIXMAPS_DIR);
+ PAROLE_STREAM_GET_PRIVATE(stream)->image = NULL;
+ PAROLE_STREAM_GET_PRIVATE(stream)->previous_image = NULL;
+ PAROLE_STREAM_GET_PRIVATE(stream)->image_uri = g_strdup_printf("file://%s/no-cover.png", PIXMAPS_DIR);
}
}
GdkPixbuf *
-parole_stream_get_image (GObject *object)
+parole_stream_get_image(GObject *object)
{
ParoleStream *stream;
GdkPixbuf *pixbuf;
- stream = PAROLE_STREAM (object);
+ stream = PAROLE_STREAM(object);
if (PAROLE_STREAM_GET_PRIVATE (stream)->image)
- pixbuf = gdk_pixbuf_copy(GDK_PIXBUF(PAROLE_STREAM_GET_PRIVATE (stream)->image));
+ pixbuf = gdk_pixbuf_copy(GDK_PIXBUF(PAROLE_STREAM_GET_PRIVATE(stream)->image));
else
pixbuf = NULL;
@@ -400,9 +400,9 @@ parole_stream_get_image (GObject *object)
}
static void
-parole_stream_class_init (ParoleStreamClass *klass)
+parole_stream_class_init(ParoleStreamClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_stream_finalize;
@@ -416,9 +416,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_URI,
- g_param_spec_string ("uri",
+ g_param_spec_string("uri",
"Uri",
"Uri",
NULL,
@@ -432,9 +432,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SUBTITLES,
- g_param_spec_string ("subtitles",
+ g_param_spec_string("subtitles",
"Subtitles",
"Subtitle file",
NULL,
@@ -447,9 +447,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_HAS_AUDIO,
- g_param_spec_boolean ("has-audio",
+ g_param_spec_boolean("has-audio",
"Has audio",
"Has audio",
FALSE,
@@ -461,9 +461,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_HAS_VIDEO,
- g_param_spec_boolean ("has-video",
+ g_param_spec_boolean("has-video",
"Has video",
"Has video",
FALSE,
@@ -476,9 +476,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_LIVE,
- g_param_spec_boolean ("live",
+ g_param_spec_boolean("live",
"Live",
"Live",
FALSE,
@@ -491,9 +491,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_MEDIA_TYPE,
- g_param_spec_enum ("media-type",
+ g_param_spec_enum("media-type",
"Media type",
"Media type",
PAROLE_ENUM_TYPE_MEDIA_TYPE,
@@ -508,9 +508,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SEEKABLE,
- g_param_spec_boolean ("seekable",
+ g_param_spec_boolean("seekable",
"Seekable",
"Seekable",
FALSE,
@@ -523,9 +523,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_DURATION,
- g_param_spec_int64 ("duration",
+ g_param_spec_int64("duration",
"Duration",
"Duration",
0, G_MAXINT64,
@@ -539,9 +539,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_TAG_AVAILABLE,
- g_param_spec_boolean ("tag-available",
+ g_param_spec_boolean("tag-available",
"Tag available",
"Tag available",
FALSE,
@@ -554,9 +554,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_ABSOLUTE_DURATION,
- g_param_spec_int64 ("absolute-duration",
+ g_param_spec_int64("absolute-duration",
"Absolution duration",
"Absolution duration",
0, G_MAXINT64,
@@ -570,9 +570,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_DISP_PAR_N,
- g_param_spec_uint ("disp-par-n",
+ g_param_spec_uint("disp-par-n",
"Disp par n",
"Disp par n",
1, G_MAXUINT,
@@ -586,9 +586,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_DISP_PAR_D,
- g_param_spec_uint ("disp-par-d",
+ g_param_spec_uint("disp-par-d",
"Disp par d",
"Disp par d",
1, G_MAXUINT,
@@ -602,9 +602,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_VIDEO_WIDTH,
- g_param_spec_int ("video-width",
+ g_param_spec_int("video-width",
"Video width",
"Video width",
0, G_MAXINT,
@@ -618,9 +618,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_VIDEO_HEIGHT,
- g_param_spec_int ("video-height",
+ g_param_spec_int("video-height",
"Video height",
"Video height",
0, G_MAXINT,
@@ -635,9 +635,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_TRACKS,
- g_param_spec_uint ("num-tracks",
+ g_param_spec_uint("num-tracks",
"Num tracks",
"Number of tracks in the audio disc",
1, 99,
@@ -653,9 +653,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_TRACK,
- g_param_spec_uint ("track",
+ g_param_spec_uint("track",
"Track",
"Track",
0, 99,
@@ -668,9 +668,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_TITLE,
- g_param_spec_string ("title",
+ g_param_spec_string("title",
"Title",
"Title",
NULL,
@@ -684,9 +684,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_ARTIST,
- g_param_spec_string ("artist",
+ g_param_spec_string("artist",
"Artist",
"Artist",
NULL,
@@ -699,9 +699,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_YEAR,
- g_param_spec_string ("year",
+ g_param_spec_string("year",
"Year",
"Year",
NULL,
@@ -714,9 +714,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_ALBUM,
- g_param_spec_string ("album",
+ g_param_spec_string("album",
"Album",
"Album",
NULL,
@@ -729,9 +729,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_COMMENT,
- g_param_spec_string ("comment",
+ g_param_spec_string("comment",
"Comment",
"Comment",
NULL,
@@ -744,9 +744,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.6
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_GENRE,
- g_param_spec_string ("genre",
+ g_param_spec_string("genre",
"Genre",
"Genre",
NULL,
@@ -759,9 +759,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.6
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_IMAGE_URI,
- g_param_spec_string ("image_uri",
+ g_param_spec_string("image_uri",
"Image URI",
"URI for the album artwork",
NULL,
@@ -774,9 +774,9 @@ parole_stream_class_init (ParoleStreamClass *klass)
*
* Since: 0.6
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_BITRATE,
- g_param_spec_uint ("bitrate",
+ g_param_spec_uint("bitrate",
"Bitrate",
"Bitrate",
0, 2147483647,
@@ -787,24 +787,24 @@ parole_stream_class_init (ParoleStreamClass *klass)
}
static void
-parole_stream_init (ParoleStream *stream)
+parole_stream_init(ParoleStream *stream)
{
- parole_stream_init_properties (stream);
+ parole_stream_init_properties(stream);
}
ParoleStream *
-parole_stream_new (void)
+parole_stream_new(void)
{
ParoleStream *stream = NULL;
- stream = g_object_new (PAROLE_TYPE_STREAM, NULL);
+ stream = g_object_new(PAROLE_TYPE_STREAM, NULL);
return stream;
}
-void parole_stream_init_properties (ParoleStream *stream)
+void parole_stream_init_properties(ParoleStream *stream)
{
ParoleStreamPrivate *priv;
- priv = PAROLE_STREAM_GET_PRIVATE (stream);
+ priv = PAROLE_STREAM_GET_PRIVATE(stream);
priv->live = FALSE;
priv->seekable = FALSE;
@@ -822,21 +822,21 @@ void parole_stream_init_properties (ParoleStream *stream)
priv->disp_par_d = 1;
priv->bitrate = 0;
- PAROLE_STREAM_FREE_STR_PROP (priv->title);
- PAROLE_STREAM_FREE_STR_PROP (priv->uri);
- PAROLE_STREAM_FREE_STR_PROP (priv->subtitles);
- PAROLE_STREAM_FREE_STR_PROP (priv->artist);
- PAROLE_STREAM_FREE_STR_PROP (priv->year);
- PAROLE_STREAM_FREE_STR_PROP (priv->album);
- PAROLE_STREAM_FREE_STR_PROP (priv->comment);
- PAROLE_STREAM_FREE_STR_PROP (priv->genre);
- PAROLE_STREAM_FREE_STR_PROP (priv->image_uri);
+ PAROLE_STREAM_FREE_STR_PROP(priv->title);
+ PAROLE_STREAM_FREE_STR_PROP(priv->uri);
+ PAROLE_STREAM_FREE_STR_PROP(priv->subtitles);
+ PAROLE_STREAM_FREE_STR_PROP(priv->artist);
+ PAROLE_STREAM_FREE_STR_PROP(priv->year);
+ PAROLE_STREAM_FREE_STR_PROP(priv->album);
+ PAROLE_STREAM_FREE_STR_PROP(priv->comment);
+ PAROLE_STREAM_FREE_STR_PROP(priv->genre);
+ PAROLE_STREAM_FREE_STR_PROP(priv->image_uri);
/* Remove the previous image if it exists */
if ( PAROLE_STREAM_GET_PRIVATE (stream)->previous_image )
{
if (g_remove (PAROLE_STREAM_GET_PRIVATE (stream)->previous_image) != 0)
- g_warning ("Failed to remove temporary artwork");
+ g_warning("Failed to remove temporary artwork");
}
- PAROLE_STREAM_GET_PRIVATE (stream)->previous_image = NULL;
+ PAROLE_STREAM_GET_PRIVATE(stream)->previous_image = NULL;
}
diff --git a/src/parole-about.c b/src/parole-about.c
index 1d2153e..ad9007c 100644
--- a/src/parole-about.c
+++ b/src/parole-about.c
@@ -42,7 +42,7 @@
*
* Display the About dialog for Parole.
**/
-void parole_about (GtkWindow *parent)
+void parole_about(GtkWindow *parent)
{
/* List of authors */
static const gchar *authors[] =
@@ -65,7 +65,7 @@ void parole_about (GtkWindow *parent)
"Copyright \302\251 2009-2011 Ali Abdallah\n"
"Copyright \302\251 2012-2014 Sean Davis, Simon Steinbeiss";
- gtk_show_about_dialog (parent,
+ gtk_show_about_dialog(parent,
"authors", authors,
"comments", _("Parole Media Player"),
"documenters", documenters,
diff --git a/src/parole-builder.c b/src/parole-builder.c
index 9402bee..5008a1c 100644
--- a/src/parole-builder.c
+++ b/src/parole-builder.c
@@ -40,15 +40,15 @@
* Build Parole's UI from the interface-file.
**/
GtkBuilder *
-parole_builder_get_main_interface (void)
+parole_builder_get_main_interface(void)
{
static gpointer parole_builder_object = NULL;
- if ( G_LIKELY (parole_builder_object != NULL) ) {
- g_object_ref (parole_builder_object);
+ if ( G_LIKELY(parole_builder_object != NULL) ) {
+ g_object_ref(parole_builder_object);
} else {
- parole_builder_object = parole_builder_new_from_string (parole_ui, parole_ui_length);
- g_object_add_weak_pointer (parole_builder_object, &parole_builder_object);
+ parole_builder_object = parole_builder_new_from_string(parole_ui, parole_ui_length);
+ g_object_add_weak_pointer(parole_builder_object, &parole_builder_object);
}
return GTK_BUILDER (parole_builder_object);
@@ -62,22 +62,22 @@ parole_builder_get_main_interface (void)
* Build Parole's UI from the condensed glade string.
**/
GtkBuilder *
-parole_builder_new_from_string (const gchar *ui, gsize length)
+parole_builder_new_from_string(const gchar *ui, gsize length)
{
GError *error = NULL;
GtkBuilder *builder;
- builder = gtk_builder_new ();
+ builder = gtk_builder_new();
/* Set the locale before loading the GtkBuilder interface definition. */
- xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+ xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
- gtk_builder_add_from_string (builder, ui, length, &error);
+ gtk_builder_add_from_string(builder, ui, length, &error);
if ( error )
{
- g_critical ("%s", error->message);
- g_error_free (error);
+ g_critical("%s", error->message);
+ g_error_free(error);
}
return builder;
diff --git a/src/parole-button.c b/src/parole-button.c
index 91761f6..607cd20 100644
--- a/src/parole-button.c
+++ b/src/parole-button.c
@@ -51,7 +51,7 @@
#include "parole-debug.h"
#include "enum-gtypes.h"
-static void parole_button_finalize (GObject *object);
+static void parole_button_finalize(GObject *object);
#define PAROLE_BUTTON_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_BUTTON, ParoleButtonPrivate))
@@ -87,7 +87,7 @@ G_DEFINE_TYPE(ParoleButton, parole_button, G_TYPE_OBJECT)
* Check if the pressed key is mapped to a function in Parole.
**/
static guint
-parole_button_get_key (unsigned int keycode)
+parole_button_get_key(unsigned int keycode)
{
ParoleButtonKey key = PAROLE_KEY_UNKNOWN;
@@ -111,7 +111,7 @@ parole_button_get_key (unsigned int keycode)
* Filter X events for keypresses, and pass the keypresses on to be processed.
**/
static GdkFilterReturn
-parole_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
+parole_button_filter_x_events(GdkXEvent *xevent, GdkEvent *ev, gpointer data)
{
ParoleButtonKey key;
ParoleButton *button;
@@ -121,15 +121,15 @@ parole_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
if ( xev->type != KeyPress )
return GDK_FILTER_CONTINUE;
- key = parole_button_get_key (xev->xkey.keycode);
+ key = parole_button_get_key(xev->xkey.keycode);
if ( key != PAROLE_KEY_UNKNOWN )
{
button = (ParoleButton *) data;
- PAROLE_DEBUG_ENUM ("Key press", key, ENUM_GTYPE_BUTTON_KEY);
+ PAROLE_DEBUG_ENUM("Key press", key, ENUM_GTYPE_BUTTON_KEY);
- g_signal_emit (G_OBJECT(button), signals[BUTTON_PRESSED], 0, key);
+ g_signal_emit(G_OBJECT(button), signals[BUTTON_PRESSED], 0, key);
return GDK_FILTER_REMOVE;
}
@@ -146,7 +146,7 @@ parole_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
* Return value: %TRUE on success, else %FALSE.
**/
static gboolean
-parole_button_grab_keystring (ParoleButton *button, guint keycode)
+parole_button_grab_keystring(ParoleButton *button, guint keycode)
{
GdkDisplay *display;
guint ret;
@@ -154,32 +154,32 @@ parole_button_grab_keystring (ParoleButton *button, guint keycode)
display = gdk_display_get_default();
- gdk_error_trap_push ();
+ gdk_error_trap_push();
- ret = XGrabKey (GDK_DISPLAY_XDISPLAY(display), keycode, modmask,
- gdk_x11_window_get_xid (button->priv->window), True,
+ ret = XGrabKey(GDK_DISPLAY_XDISPLAY(display), keycode, modmask,
+ gdk_x11_window_get_xid(button->priv->window), True,
GrabModeAsync, GrabModeAsync);
if ( ret == BadAccess )
{
- g_warning ("Failed to grab modmask=%u, keycode=%li",
+ g_warning("Failed to grab modmask=%u, keycode=%li",
modmask, (long int) keycode);
return FALSE;
}
- ret = XGrabKey (GDK_DISPLAY_XDISPLAY(display), keycode, LockMask | modmask,
- gdk_x11_window_get_xid (button->priv->window), True,
+ ret = XGrabKey(GDK_DISPLAY_XDISPLAY(display), keycode, LockMask | modmask,
+ gdk_x11_window_get_xid(button->priv->window), True,
GrabModeAsync, GrabModeAsync);
if (ret == BadAccess)
{
- g_warning ("Failed to grab modmask=%u, keycode=%li",
+ g_warning("Failed to grab modmask=%u, keycode=%li",
LockMask | modmask, (long int) keycode);
return FALSE;
}
- gdk_flush ();
- gdk_error_trap_pop_ignored ();
+ gdk_flush();
+ gdk_error_trap_pop_ignored();
return TRUE;
}
@@ -194,23 +194,23 @@ parole_button_grab_keystring (ParoleButton *button, guint keycode)
* Return value: %TRUE on success, else %FALSE.
**/
static gboolean
-parole_button_xevent_key (ParoleButton *button, guint keysym , ParoleButtonKey key)
+parole_button_xevent_key(ParoleButton *button, guint keysym , ParoleButtonKey key)
{
- guint keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), keysym);
+ guint keycode = XKeysymToKeycode(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), keysym);
if ( keycode == 0 )
{
- g_warning ("could not map keysym %x to keycode\n", keysym);
+ g_warning("could not map keysym %x to keycode\n", keysym);
return FALSE;
}
if ( !parole_button_grab_keystring(button, keycode))
{
- g_warning ("Failed to grab %i\n", keycode);
+ g_warning("Failed to grab %i\n", keycode);
return FALSE;
}
- PAROLE_DEBUG_ENUM_FULL (key, ENUM_GTYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode);
+ PAROLE_DEBUG_ENUM_FULL(key, ENUM_GTYPE_BUTTON_KEY, "Grabbed key %li ", (long int)keycode);
parole_key_map[key].key_code = keycode;
parole_key_map[key].key = key;
@@ -225,17 +225,17 @@ parole_button_xevent_key (ParoleButton *button, guint keysym , ParoleButtonKey k
* Setup Parole's keyboard mappings.
**/
static void
-parole_button_setup (ParoleButton *button)
+parole_button_setup(ParoleButton *button)
{
- button->priv->screen = gdk_screen_get_default ();
- button->priv->window = gdk_screen_get_root_window (button->priv->screen);
+ button->priv->screen = gdk_screen_get_default();
+ button->priv->window = gdk_screen_get_root_window(button->priv->screen);
- parole_button_xevent_key (button, XF86XK_AudioPlay, PAROLE_KEY_AUDIO_PLAY);
- parole_button_xevent_key (button, XF86XK_AudioStop, PAROLE_KEY_AUDIO_STOP);
- parole_button_xevent_key (button, XF86XK_AudioPrev, PAROLE_KEY_AUDIO_PREV);
- parole_button_xevent_key (button, XF86XK_AudioNext, PAROLE_KEY_AUDIO_NEXT);
+ parole_button_xevent_key(button, XF86XK_AudioPlay, PAROLE_KEY_AUDIO_PLAY);
+ parole_button_xevent_key(button, XF86XK_AudioStop, PAROLE_KEY_AUDIO_STOP);
+ parole_button_xevent_key(button, XF86XK_AudioPrev, PAROLE_KEY_AUDIO_PREV);
+ parole_button_xevent_key(button, XF86XK_AudioNext, PAROLE_KEY_AUDIO_NEXT);
- gdk_window_add_filter (button->priv->window,
+ gdk_window_add_filter(button->priv->window,
parole_button_filter_x_events, button);
}
@@ -251,10 +251,10 @@ parole_button_class_init(ParoleButtonClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS(klass);
signals[BUTTON_PRESSED] =
- g_signal_new ("button-pressed",
+ g_signal_new("button-pressed",
PAROLE_TYPE_BUTTON,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleButtonClass, button_pressed),
+ G_STRUCT_OFFSET(ParoleButtonClass, button_pressed),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
G_TYPE_NONE, 1, ENUM_GTYPE_BUTTON_KEY);
@@ -271,14 +271,14 @@ parole_button_class_init(ParoleButtonClass *klass)
* Initialize a #ParoleButton instance.
**/
static void
-parole_button_init (ParoleButton *button)
+parole_button_init(ParoleButton *button)
{
- button->priv = PAROLE_BUTTON_GET_PRIVATE (button);
+ button->priv = PAROLE_BUTTON_GET_PRIVATE(button);
button->priv->screen = NULL;
button->priv->window = NULL;
- parole_button_setup (button);
+ parole_button_setup(button);
}
/**
@@ -288,7 +288,7 @@ parole_button_init (ParoleButton *button)
* Finalize a #ParoleButton object.
**/
static void
-parole_button_finalize (GObject *object)
+parole_button_finalize(GObject *object)
{
G_OBJECT_CLASS(parole_button_parent_class)->finalize(object);
}
@@ -299,11 +299,11 @@ parole_button_finalize (GObject *object)
* Create a new #ParoleButton instance.
**/
ParoleButton *
-parole_button_new (void)
+parole_button_new(void)
{
ParoleButton *button = NULL;
- button = g_object_new (PAROLE_TYPE_BUTTON, NULL);
+ button = g_object_new(PAROLE_TYPE_BUTTON, NULL);
return button;
}
diff --git a/src/parole-clutter.c b/src/parole-clutter.c
index 66c419c..462b903 100644
--- a/src/parole-clutter.c
+++ b/src/parole-clutter.c
@@ -36,7 +36,7 @@
#include "parole-clutter.h"
#define PAROLE_CLUTTER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_CLUTTER, ParoleClutterPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_CLUTTER, ParoleClutterPrivate))
struct ParoleClutterPrivate
{
@@ -61,48 +61,48 @@ enum
static gpointer parole_clutter_object = NULL;
-G_DEFINE_TYPE (ParoleClutter, parole_clutter, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE(ParoleClutter, parole_clutter, GTK_TYPE_WIDGET)
static void
-parole_clutter_finalize (GObject *object)
+parole_clutter_finalize(GObject *object)
{
// ParoleClutter *clutter;
// clutter = PAROLE_CLUTTER (object);
- TRACE ("start");
+ TRACE("start");
- G_OBJECT_CLASS (parole_clutter_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_clutter_parent_class)->finalize(object);
}
static void
-parole_clutter_show (GtkWidget *widget)
+parole_clutter_show(GtkWidget *widget)
{
ParoleClutter *clutter = PAROLE_CLUTTER(parole_clutter_get());
GtkWidget *embed_window = clutter->priv->embed;
if ( gtk_widget_get_window(embed_window) )
- gdk_window_show (gtk_widget_get_window(embed_window));
+ gdk_window_show(gtk_widget_get_window(embed_window));
if ( GTK_WIDGET_CLASS (parole_clutter_parent_class)->show )
- GTK_WIDGET_CLASS (parole_clutter_parent_class)->show (embed_window);
+ GTK_WIDGET_CLASS(parole_clutter_parent_class)->show(embed_window);
}
static void
-parole_clutter_hide (GtkWidget *widget)
+parole_clutter_hide(GtkWidget *widget)
{
ParoleClutter *clutter = PAROLE_CLUTTER(parole_clutter_get());
GtkWidget *embed_window = clutter->priv->embed;
if ( gtk_widget_get_window(embed_window) )
- gdk_window_hide (gtk_widget_get_window(embed_window));
+ gdk_window_hide(gtk_widget_get_window(embed_window));
if ( GTK_WIDGET_CLASS (parole_clutter_parent_class)->hide )
- GTK_WIDGET_CLASS (parole_clutter_parent_class)->hide (embed_window);
+ GTK_WIDGET_CLASS(parole_clutter_parent_class)->hide(embed_window);
}
static void
-parole_clutter_constructed (GObject *object)
+parole_clutter_constructed(GObject *object)
{
// ParoleClutter *clutter;
@@ -110,7 +110,7 @@ parole_clutter_constructed (GObject *object)
}
static void
-parole_clutter_get_video_output_size (ParoleClutter *clutter, gint *ret_w, gint *ret_h)
+parole_clutter_get_video_output_size(ParoleClutter *clutter, gint *ret_w, gint *ret_h)
{
guint video_w, video_h;
guint video_par_n, video_par_d;
@@ -119,7 +119,7 @@ parole_clutter_get_video_output_size (ParoleClutter *clutter, gint *ret_w, gint
/*
* TODO: FIX Aspect Ratios following change
*/
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
gtk_widget_get_allocation(GTK_WIDGET(clutter->priv->embed), allocation);
*ret_w = allocation->width;
*ret_h = allocation->height;
@@ -168,22 +168,22 @@ parole_clutter_get_video_output_size (ParoleClutter *clutter, gint *ret_w, gint
{
if (video_w % dar_n == 0) {
*ret_w = video_w;
- *ret_h = (guint) gst_util_uint64_scale (video_w, dar_d, dar_n);
+ *ret_h =(guint) gst_util_uint64_scale(video_w, dar_d, dar_n);
} else {
- *ret_w = (guint) gst_util_uint64_scale (video_h, dar_n, dar_d);
+ *ret_w =(guint) gst_util_uint64_scale(video_h, dar_n, dar_d);
*ret_h = video_h;
}
- TRACE ("Got best video size %dx%d fraction, %d/%d\n", *ret_w, *ret_h, disp_par_n, disp_par_d);
+ TRACE("Got best video size %dx%d fraction, %d/%d\n", *ret_w, *ret_h, disp_par_n, disp_par_d);
}
}
}
static void
-parole_clutter_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+parole_clutter_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
{
ParoleClutter *clutter;
- g_return_if_fail (allocation != NULL);
+ g_return_if_fail(allocation != NULL);
gtk_widget_set_allocation(widget, allocation);
@@ -197,9 +197,9 @@ parole_clutter_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
w = allocation->width;
h = allocation->height;
- clutter_actor_set_size (clutter->priv->stage, w, h);
+ clutter_actor_set_size(clutter->priv->stage, w, h);
- parole_clutter_get_video_output_size (clutter, &w, &h);
+ parole_clutter_get_video_output_size(clutter, &w, &h);
width = w;
height = h;
@@ -212,83 +212,83 @@ parole_clutter_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
width *= ratio;
height *= ratio;
- clutter_actor_set_size (clutter->priv->texture, width, height);
- clutter_actor_set_x (clutter->priv->texture, (allocation->width - width)/2);
- clutter_actor_set_y (clutter->priv->texture, (allocation->height - height)/2);
+ clutter_actor_set_size(clutter->priv->texture, width, height);
+ clutter_actor_set_x(clutter->priv->texture, (allocation->width - width) / 2);
+ clutter_actor_set_y(clutter->priv->texture, (allocation->height - height) / 2);
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw(widget);
}
}
static void
-parole_clutter_conf_notify_cb (GObject *object, GParamSpec *spec, ParoleClutter *clutter)
+parole_clutter_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleClutter *clutter)
{
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
if ( !g_strcmp0 ("aspect-ratio", spec->name) )
{
- g_object_get (G_OBJECT (clutter->priv->conf),
+ g_object_get(G_OBJECT(clutter->priv->conf),
"aspect-ratio", &clutter->priv->aspect_ratio,
NULL);
- gtk_widget_get_allocation(GTK_WIDGET (clutter), allocation);
- parole_clutter_size_allocate (GTK_WIDGET (clutter->priv->embed), allocation);
+ gtk_widget_get_allocation(GTK_WIDGET(clutter), allocation);
+ parole_clutter_size_allocate(GTK_WIDGET(clutter->priv->embed), allocation);
g_free(allocation);
}
}
-static void parole_clutter_get_property (GObject *object,
+static void parole_clutter_get_property(GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
ParoleClutter *clutter;
- clutter = PAROLE_CLUTTER (object);
+ clutter = PAROLE_CLUTTER(object);
switch (prop_id)
{
case PROP_CONF_OBJ:
- g_value_set_pointer (value, clutter->priv->conf);
+ g_value_set_pointer(value, clutter->priv->conf);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
-static void parole_clutter_set_property (GObject *object,
+static void parole_clutter_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
ParoleClutter *clutter;
- clutter = PAROLE_CLUTTER (object);
+ clutter = PAROLE_CLUTTER(object);
switch (prop_id)
{
case PROP_CONF_OBJ:
- clutter->priv->conf = g_value_get_pointer (value);
+ clutter->priv->conf = g_value_get_pointer(value);
if (clutter->priv->conf)
{
- g_object_get (G_OBJECT (clutter->priv->conf),
+ g_object_get(G_OBJECT(clutter->priv->conf),
"aspect-ratio", &clutter->priv->aspect_ratio,
NULL);
- g_signal_connect (G_OBJECT (clutter->priv->conf), "notify",
- G_CALLBACK (parole_clutter_conf_notify_cb), clutter);
+ g_signal_connect(G_OBJECT(clutter->priv->conf), "notify",
+ G_CALLBACK(parole_clutter_conf_notify_cb), clutter);
}
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static void
-parole_clutter_class_init (ParoleClutterClass *klass)
+parole_clutter_class_init(ParoleClutterClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
object_class->finalize = parole_clutter_finalize;
object_class->constructed = parole_clutter_constructed;
@@ -299,9 +299,9 @@ parole_clutter_class_init (ParoleClutterClass *klass)
widget_class->show = parole_clutter_show;
widget_class->hide = parole_clutter_hide;
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_CONF_OBJ,
- g_param_spec_pointer ("conf-object",
+ g_param_spec_pointer("conf-object",
NULL, NULL,
G_PARAM_CONSTRUCT_ONLY|
G_PARAM_READWRITE));
@@ -310,12 +310,12 @@ parole_clutter_class_init (ParoleClutterClass *klass)
}
static void
-parole_clutter_init (ParoleClutter *clutter)
+parole_clutter_init(ParoleClutter *clutter)
{
ClutterColor *black;
GValue value = {0};
- clutter->priv = PAROLE_CLUTTER_GET_PRIVATE (clutter);
+ clutter->priv = PAROLE_CLUTTER_GET_PRIVATE(clutter);
g_value_init(&value, G_TYPE_BOOLEAN);
g_value_set_boolean(&value, TRUE);
@@ -323,63 +323,63 @@ parole_clutter_init (ParoleClutter *clutter)
black = clutter_color_new(0, 0, 0, 255);
clutter->priv->embed = gtk_clutter_embed_new();
- g_signal_connect (G_OBJECT(clutter->priv->embed), "size-allocate",
+ g_signal_connect(G_OBJECT(clutter->priv->embed), "size-allocate",
G_CALLBACK(parole_clutter_size_allocate), NULL);
/* Configure the Stage */
- clutter->priv->stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (clutter->priv->embed));
+ clutter->priv->stage = gtk_clutter_embed_get_stage(GTK_CLUTTER_EMBED(clutter->priv->embed));
clutter_actor_set_background_color(clutter->priv->stage, black);
/* Configure the Texture */
- clutter->priv->texture = CLUTTER_ACTOR (g_object_new (CLUTTER_TYPE_TEXTURE, "disable-slicing", TRUE, NULL));
+ clutter->priv->texture = CLUTTER_ACTOR(g_object_new(CLUTTER_TYPE_TEXTURE, "disable-slicing", TRUE, NULL));
clutter_actor_set_x_align(clutter->priv->texture, CLUTTER_ACTOR_ALIGN_CENTER);
clutter_actor_set_y_align(clutter->priv->texture, CLUTTER_ACTOR_ALIGN_CENTER);
- g_object_set_property (G_OBJECT(clutter->priv->texture), "keep-aspect-ratio", &value);
- clutter_actor_add_child (clutter->priv->stage, clutter->priv->texture);
+ g_object_set_property(G_OBJECT(clutter->priv->texture), "keep-aspect-ratio", &value);
+ clutter_actor_add_child(clutter->priv->stage, clutter->priv->texture);
- gtk_widget_set_can_focus (GTK_WIDGET (clutter), TRUE);
+ gtk_widget_set_can_focus(GTK_WIDGET(clutter), TRUE);
}
GtkWidget *
-parole_clutter_new (gpointer conf_obj)
+parole_clutter_new(gpointer conf_obj)
{
- parole_clutter_object = g_object_new (PAROLE_TYPE_CLUTTER,
+ parole_clutter_object = g_object_new(PAROLE_TYPE_CLUTTER,
"conf-object", conf_obj,
NULL);
- g_object_add_weak_pointer (parole_clutter_object, &parole_clutter_object);
+ g_object_add_weak_pointer(parole_clutter_object, &parole_clutter_object);
return GTK_WIDGET (parole_clutter_object);
}
-GtkWidget *parole_clutter_get (void)
+GtkWidget *parole_clutter_get(void)
{
- if ( G_LIKELY (parole_clutter_object != NULL ) ) {
+ if ( G_LIKELY(parole_clutter_object != NULL ) ) {
/*
* Don't increase the reference count of this object as
* we need it to be destroyed immediately when the main
* window is destroyed.
*/
} else {
- parole_clutter_object = g_object_new (PAROLE_TYPE_CLUTTER, NULL);
- g_object_add_weak_pointer (parole_clutter_object, &parole_clutter_object);
+ parole_clutter_object = g_object_new(PAROLE_TYPE_CLUTTER, NULL);
+ g_object_add_weak_pointer(parole_clutter_object, &parole_clutter_object);
}
return GTK_WIDGET (parole_clutter_object);
}
-void parole_clutter_set_video_dimensions (ParoleClutter *clutter, gint w, gint h)
+void parole_clutter_set_video_dimensions(ParoleClutter *clutter, gint w, gint h)
{
clutter->priv->video_w = w;
clutter->priv->video_h = h;
}
-void parole_clutter_apply_texture (ParoleClutter *clutter, GstElement **element)
+void parole_clutter_apply_texture(ParoleClutter *clutter, GstElement **element)
{
- g_object_set (*element, "texture", clutter->priv->texture, NULL);
+ g_object_set(*element, "texture", clutter->priv->texture, NULL);
}
-GtkWidget *parole_clutter_get_embed_widget (ParoleClutter *clutter)
+GtkWidget *parole_clutter_get_embed_widget(ParoleClutter *clutter)
{
return clutter->priv->embed;
}
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 993c15d..c295f2b 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -43,42 +43,42 @@
* GtkBuilder Callbacks
*/
-void parole_conf_dialog_response_cb (GtkDialog *dialog,
+void parole_conf_dialog_response_cb(GtkDialog *dialog,
gint response_id,
ParoleConfDialog *self);
void
-parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget,
+parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget,
ParoleConfDialog *self);
void
-parole_conf_dialog_sink_plugin_changed_cb (GtkComboBox *widget,
+parole_conf_dialog_sink_plugin_changed_cb(GtkComboBox *widget,
ParoleConfDialog *self);
-void parole_conf_dialog_font_set_cb (GtkFontButton *button,
+void parole_conf_dialog_font_set_cb(GtkFontButton *button,
ParoleConfDialog *self);
-void parole_conf_dialog_enable_vis_changed_cb (GObject *object,
+void parole_conf_dialog_enable_vis_changed_cb(GObject *object,
GParamSpec *pspec,
gpointer *data);
void
-parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
+parole_conf_dialog_subtitle_encoding_changed_cb(GtkComboBox *widget,
ParoleConfDialog *self);
-void brightness_value_changed_cb (GtkRange *range,
+void brightness_value_changed_cb(GtkRange *range,
ParoleConfDialog *self);
-void contrast_value_changed_cb (GtkRange *range,
+void contrast_value_changed_cb(GtkRange *range,
ParoleConfDialog *self);
-void hue_value_changed_cb (GtkRange *range,
+void hue_value_changed_cb(GtkRange *range,
ParoleConfDialog *self);
-void saturation_value_changed_cb (GtkRange *range,
+void saturation_value_changed_cb(GtkRange *range,
ParoleConfDialog *self);
-void reset_color_clicked_cb (GtkButton *button,
+void reset_color_clicked_cb(GtkButton *button,
ParoleConfDialog *self);
/*
@@ -86,7 +86,7 @@ void reset_color_clicked_cb (GtkButton *button,
*/
#define PAROLE_CONF_DIALOG_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_CONF_DIALOG, ParoleConfDialogPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_CONF_DIALOG, ParoleConfDialogPrivate))
struct ParoleConfDialogPrivate
{
@@ -107,46 +107,46 @@ struct ParoleConfDialogPrivate
GtkWidget *saturation;
};
-G_DEFINE_TYPE (ParoleConfDialog, parole_conf_dialog, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleConfDialog, parole_conf_dialog, G_TYPE_OBJECT)
/* Destroy the dialog */
static void
-parole_conf_dialog_destroy (GtkWidget *widget, ParoleConfDialog *self)
+parole_conf_dialog_destroy(GtkWidget *widget, ParoleConfDialog *self)
{
gtk_widget_hide(widget);
}
/* Change the various image properties */
-void reset_color_clicked_cb (GtkButton *button, ParoleConfDialog *self)
+void reset_color_clicked_cb(GtkButton *button, ParoleConfDialog *self)
{
- gtk_range_set_value (GTK_RANGE (self->priv->brightness), 0);
- gtk_range_set_value (GTK_RANGE (self->priv->contrast), 0);
- gtk_range_set_value (GTK_RANGE (self->priv->hue), 0);
- gtk_range_set_value (GTK_RANGE (self->priv->saturation), 0);
+ gtk_range_set_value(GTK_RANGE(self->priv->brightness), 0);
+ gtk_range_set_value(GTK_RANGE(self->priv->contrast), 0);
+ gtk_range_set_value(GTK_RANGE(self->priv->hue), 0);
+ gtk_range_set_value(GTK_RANGE(self->priv->saturation), 0);
}
-void parole_conf_dialog_response_cb (GtkDialog *dialog, gint response_id, ParoleConfDialog *self)
+void parole_conf_dialog_response_cb(GtkDialog *dialog, gint response_id, ParoleConfDialog *self)
{
switch (response_id)
{
case GTK_RESPONSE_HELP:
break;
default:
- parole_conf_dialog_destroy (GTK_WIDGET (dialog), self);
+ parole_conf_dialog_destroy(GTK_WIDGET(dialog), self);
break;
}
}
/* Change subtitle encoding */
-void parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget, ParoleConfDialog *self)
+void parole_conf_dialog_subtitle_encoding_changed_cb(GtkComboBox *widget, ParoleConfDialog *self)
{
- g_object_set (G_OBJECT (self->priv->conf),
- "subtitle-encoding", parole_subtitle_encoding_get_selected (widget),
+ g_object_set(G_OBJECT(self->priv->conf),
+ "subtitle-encoding", parole_subtitle_encoding_get_selected(widget),
NULL);
}
/* Enable visualisations */
-void parole_conf_dialog_enable_vis_changed_cb (GObject *object,
+void parole_conf_dialog_enable_vis_changed_cb(GObject *object,
GParamSpec *pspec,
gpointer *data)
{
@@ -154,49 +154,49 @@ void parole_conf_dialog_enable_vis_changed_cb (GObject *object,
ParoleConfDialog *self;
self = PAROLE_CONF_DIALOG(data);
- active = gtk_switch_get_active (GTK_SWITCH(GTK_WIDGET(object)));
+ active = gtk_switch_get_active(GTK_SWITCH(GTK_WIDGET(object)));
- gtk_widget_set_sensitive (self->priv->vis_combox, active);
+ gtk_widget_set_sensitive(self->priv->vis_combox, active);
}
/* Generic function to change all image properties */
static void
-set_effect_value (ParoleConfDialog *self, GtkRange *range, const gchar *name)
+set_effect_value(ParoleConfDialog *self, GtkRange *range, const gchar *name)
{
gint value;
- value = gtk_range_get_value (range);
+ value = gtk_range_get_value(range);
- g_object_set (G_OBJECT (self->priv->conf),
+ g_object_set(G_OBJECT(self->priv->conf),
name, value,
NULL);
}
/* Change brightness */
-void brightness_value_changed_cb (GtkRange *range, ParoleConfDialog *self)
+void brightness_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
{
- set_effect_value (self, range, "brightness");
+ set_effect_value(self, range, "brightness");
}
/* Change contrast */
-void contrast_value_changed_cb (GtkRange *range, ParoleConfDialog *self)
+void contrast_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
{
- set_effect_value (self, range, "contrast");
+ set_effect_value(self, range, "contrast");
}
/* Change hue */
-void hue_value_changed_cb (GtkRange *range, ParoleConfDialog *self)
+void hue_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
{
- set_effect_value (self, range, "hue");
+ set_effect_value(self, range, "hue");
}
/* Change saturation */
-void saturation_value_changed_cb (GtkRange *range, ParoleConfDialog *self)
+void saturation_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
{
- set_effect_value (self, range, "saturation");
+ set_effect_value(self, range, "saturation");
}
-void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget, ParoleConfDialog *self)
+void parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget, ParoleConfDialog *self)
{
gchar *active = NULL;
GstElementFactory *f;
@@ -205,23 +205,23 @@ void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget, ParoleConfD
GtkTreeModel *model = gtk_combo_box_get_model(widget);
if (gtk_combo_box_get_active_iter (widget, &iter))
- gtk_tree_model_get (model, &iter, 0, &active, -1);
+ gtk_tree_model_get(model, &iter, 0, &active, -1);
else
return;
- f = g_hash_table_lookup (self->priv->vis_plugins, active);
+ f = g_hash_table_lookup(self->priv->vis_plugins, active);
if ( f )
{
- g_object_set (G_OBJECT (self->priv->conf),
- "vis-name", gst_object_get_name (GST_OBJECT (f)),
+ g_object_set(G_OBJECT(self->priv->conf),
+ "vis-name", gst_object_get_name(GST_OBJECT(f)),
NULL);
}
- g_free (active);
+ g_free(active);
}
-void parole_conf_dialog_sink_plugin_changed_cb (GtkComboBox *widget, ParoleConfDialog *self)
+void parole_conf_dialog_sink_plugin_changed_cb(GtkComboBox *widget, ParoleConfDialog *self)
{
gchar *active = NULL;
@@ -229,49 +229,49 @@ void parole_conf_dialog_sink_plugin_changed_cb (GtkComboBox *widget, ParoleConf
GtkTreeModel *model = gtk_combo_box_get_model(widget);
if (gtk_combo_box_get_active_iter (widget, &iter))
- gtk_tree_model_get (model, &iter, 0, &active, -1);
+ gtk_tree_model_get(model, &iter, 0, &active, -1);
else
return;
if (g_strcmp0(active, "other") != 0)
{
- g_object_set (G_OBJECT (self->priv->conf),
+ g_object_set(G_OBJECT(self->priv->conf),
"videosink", g_strdup(active),
NULL);
}
- gtk_widget_show (self->priv->backend_infobar);
+ gtk_widget_show(self->priv->backend_infobar);
- g_free (active);
+ g_free(active);
}
/* Change subtitle font */
-void parole_conf_dialog_font_set_cb (GtkFontButton *button, ParoleConfDialog *self)
+void parole_conf_dialog_font_set_cb(GtkFontButton *button, ParoleConfDialog *self)
{
- g_object_set (G_OBJECT (self->priv->conf),
- "subtitle-font", gtk_font_button_get_font_name (button),
+ g_object_set(G_OBJECT(self->priv->conf),
+ "subtitle-font", gtk_font_button_get_font_name(button),
NULL);
}
/* Finalize the dialog */
static void
-parole_conf_dialog_finalize (GObject *object)
+parole_conf_dialog_finalize(GObject *object)
{
ParoleConfDialog *self;
- self = PAROLE_CONF_DIALOG (object);
+ self = PAROLE_CONF_DIALOG(object);
- g_object_unref (self->priv->conf);
- g_hash_table_destroy (self->priv->vis_plugins);
+ g_object_unref(self->priv->conf);
+ g_hash_table_destroy(self->priv->vis_plugins);
- G_OBJECT_CLASS (parole_conf_dialog_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_conf_dialog_parent_class)->finalize(object);
}
/* Initialize the config-dialog class */
static void
-parole_conf_dialog_class_init (ParoleConfDialogClass *klass)
+parole_conf_dialog_class_init(ParoleConfDialogClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_conf_dialog_finalize;
@@ -280,17 +280,17 @@ parole_conf_dialog_class_init (ParoleConfDialogClass *klass)
/* Initialize the dialog */
static void
-parole_conf_dialog_init (ParoleConfDialog *self)
+parole_conf_dialog_init(ParoleConfDialog *self)
{
- self->priv = PAROLE_CONF_DIALOG_GET_PRIVATE (self);
- self->priv->conf = parole_conf_new ();
+ self->priv = PAROLE_CONF_DIALOG_GET_PRIVATE(self);
+ self->priv->conf = parole_conf_new();
- self->priv->vis_plugins = parole_vis_get_plugins ();
+ self->priv->vis_plugins = parole_vis_get_plugins();
}
/* Fill the combobox with visualisations */
static void
-parole_conf_dialog_add_vis_plugins (gpointer key, gpointer value, GtkWidget *combox)
+parole_conf_dialog_add_vis_plugins(gpointer key, gpointer value, GtkWidget *combox)
{
GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combox)));
GtkTreeIter iter;
@@ -298,12 +298,12 @@ parole_conf_dialog_add_vis_plugins (gpointer key, gpointer value, GtkWidget *com
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, (const gchar *) key, -1);
- g_object_unref (store);
+ g_object_unref(store);
}
#ifdef HAVE_CLUTTER
static void
-parole_conf_dialog_add_clutter_sink (ParoleConfDialog *dialog, GtkComboBox *combobox)
+parole_conf_dialog_add_clutter_sink(ParoleConfDialog *dialog, GtkComboBox *combobox)
{
GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)));
GtkTreeIter iter;
@@ -312,13 +312,13 @@ parole_conf_dialog_add_clutter_sink (ParoleConfDialog *dialog, GtkComboBox *comb
gtk_list_store_set(store, &iter, 0, g_strdup("cluttersink"), -1);
gtk_list_store_set(store, &iter, 1, g_strdup(_("Clutter (OpenGL)")), -1);
- g_object_unref (store);
+ g_object_unref(store);
}
#endif
/* Set the combobox to the default visualisation plugin */
static gboolean
-parole_conf_dialog_set_default_vis_plugin (GtkTreeModel *model, GtkTreePath *path,
+parole_conf_dialog_set_default_vis_plugin(GtkTreeModel *model, GtkTreePath *path,
GtkTreeIter *iter, ParoleConfDialog *self)
{
GstElementFactory *f;
@@ -326,99 +326,99 @@ parole_conf_dialog_set_default_vis_plugin (GtkTreeModel *model, GtkTreePath *pat
gchar *combox_text;
gboolean ret = FALSE;
- g_object_get (G_OBJECT (self->priv->conf),
+ g_object_get(G_OBJECT(self->priv->conf),
"vis-name", &vis_name,
NULL);
- gtk_tree_model_get (model, iter,
+ gtk_tree_model_get(model, iter,
0, &combox_text,
-1);
- f = g_hash_table_lookup (self->priv->vis_plugins, combox_text);
+ f = g_hash_table_lookup(self->priv->vis_plugins, combox_text);
- if ( !g_strcmp0 (vis_name, "none") ) {
+ if ( !g_strcmp0(vis_name, "none") ) {
if ( !g_strcmp0 (gst_object_get_name (GST_OBJECT (f)), "Goom") )
ret = TRUE;
- } else if ( !g_strcmp0 (gst_object_get_name (GST_OBJECT (f)), vis_name) ) {
+ } else if ( !g_strcmp0(gst_object_get_name(GST_OBJECT(f)), vis_name) ) {
ret = TRUE;
}
if ( ret == TRUE )
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self->priv->vis_combox), iter);
+ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(self->priv->vis_combox), iter);
return ret;
}
/* Set the combobox to the default sink plugin */
static gboolean
-parole_conf_dialog_set_default_sink_plugin (ParoleConfDialog *self)
+parole_conf_dialog_set_default_sink_plugin(ParoleConfDialog *self)
{
gchar *sink_name;
- g_object_get (G_OBJECT (self->priv->conf),
+ g_object_get(G_OBJECT(self->priv->conf),
"videosink", &sink_name,
NULL);
if (g_strcmp0(sink_name, "xvimagesink") == 0) {
- gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->sink_combox), 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(self->priv->sink_combox), 0);
return TRUE;
} else if (g_strcmp0(sink_name, "ximagesink") == 0) {
- gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->sink_combox), 1);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(self->priv->sink_combox), 1);
return TRUE;
#ifdef HAVE_CLUTTER
} else if (g_strcmp0(sink_name, "cluttersink") == 0) {
- gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->sink_combox), 2);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(self->priv->sink_combox), 2);
return TRUE;
#endif
} else {
- gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->sink_combox), 1);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(self->priv->sink_combox), 1);
return FALSE;
}
}
/* Load the rest of the settings stored in the rc file */
static void
-parole_conf_dialog_set_defaults (ParoleConfDialog *self)
+parole_conf_dialog_set_defaults(ParoleConfDialog *self)
{
GtkTreeModel *model;
gboolean vis_enabled;
gchar *subtitle_font;
gchar *subtitle_encoding;
- g_object_get (G_OBJECT (self->priv->conf),
+ g_object_get(G_OBJECT(self->priv->conf),
"vis-enabled", &vis_enabled,
"subtitle-font", &subtitle_font,
"subtitle-encoding", &subtitle_encoding,
NULL);
/* Update widget-states according to settings */
- gtk_widget_set_sensitive (self->priv->vis_combox, vis_enabled);
+ gtk_widget_set_sensitive(self->priv->vis_combox, vis_enabled);
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->priv->vis_combox));
+ model = gtk_combo_box_get_model(GTK_COMBO_BOX(self->priv->vis_combox));
- gtk_tree_model_foreach (model,
+ gtk_tree_model_foreach(model,
(GtkTreeModelForeachFunc) parole_conf_dialog_set_default_vis_plugin,
self);
- parole_conf_dialog_set_default_sink_plugin (self);
+ parole_conf_dialog_set_default_sink_plugin(self);
- parole_subtitle_encoding_set (GTK_COMBO_BOX (self->priv->encoding), subtitle_encoding);
+ parole_subtitle_encoding_set(GTK_COMBO_BOX(self->priv->encoding), subtitle_encoding);
- gtk_font_button_set_font_name (GTK_FONT_BUTTON (self->priv->font_button), subtitle_font);
+ gtk_font_button_set_font_name(GTK_FONT_BUTTON(self->priv->font_button), subtitle_font);
- g_free (subtitle_font);
- g_free (subtitle_encoding);
+ g_free(subtitle_font);
+ g_free(subtitle_encoding);
}
ParoleConfDialog *
-parole_conf_dialog_new (void)
+parole_conf_dialog_new(void)
{
ParoleConfDialog *parole_conf_dialog = NULL;
- parole_conf_dialog = g_object_new (PAROLE_TYPE_CONF_DIALOG, NULL);
+ parole_conf_dialog = g_object_new(PAROLE_TYPE_CONF_DIALOG, NULL);
return parole_conf_dialog;
}
-void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent)
+void parole_conf_dialog_open(ParoleConfDialog *self, GtkWidget *parent)
{
GtkBuilder *builder;
GtkWidget *dialog;
@@ -429,134 +429,134 @@ void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent)
GtkAdjustment *adjustment;
GValue step_increment = {0};
- builder = parole_builder_new_from_string (parole_settings_ui, parole_settings_ui_length);
+ builder = parole_builder_new_from_string(parole_settings_ui, parole_settings_ui_length);
- dialog = GTK_WIDGET (gtk_builder_get_object (builder, "settings-dialog"));
- combox = GTK_WIDGET (gtk_builder_get_object (builder, "vis-combobox"));
+ dialog = GTK_WIDGET(gtk_builder_get_object(builder, "settings-dialog"));
+ combox = GTK_WIDGET(gtk_builder_get_object(builder, "vis-combobox"));
- self->priv->toggle_vis = GTK_WIDGET (gtk_builder_get_object (builder, "enable-vis"));
- self->priv->toggle_subtitle = GTK_WIDGET (gtk_builder_get_object (builder, "enable-subtitle"));
- self->priv->font_button = GTK_WIDGET (gtk_builder_get_object (builder, "fontbutton"));
- self->priv->encoding = GTK_WIDGET (gtk_builder_get_object (builder, "encoding"));
+ self->priv->toggle_vis = GTK_WIDGET(gtk_builder_get_object(builder, "enable-vis"));
+ self->priv->toggle_subtitle = GTK_WIDGET(gtk_builder_get_object(builder, "enable-subtitle"));
+ self->priv->font_button = GTK_WIDGET(gtk_builder_get_object(builder, "fontbutton"));
+ self->priv->encoding = GTK_WIDGET(gtk_builder_get_object(builder, "encoding"));
- parole_subtitle_encoding_init (GTK_COMBO_BOX (self->priv->encoding));
+ parole_subtitle_encoding_init(GTK_COMBO_BOX(self->priv->encoding));
- g_hash_table_foreach (self->priv->vis_plugins, (GHFunc) parole_conf_dialog_add_vis_plugins, combox);
+ g_hash_table_foreach(self->priv->vis_plugins, (GHFunc)parole_conf_dialog_add_vis_plugins, combox);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
+ gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent));
self->priv->vis_combox = combox;
- self->priv->sink_combox = GTK_WIDGET (gtk_builder_get_object (builder, "combobox-sink"));
+ self->priv->sink_combox = GTK_WIDGET(gtk_builder_get_object(builder, "combobox-sink"));
#ifdef HAVE_CLUTTER
- parole_conf_dialog_add_clutter_sink (self, GTK_COMBO_BOX(self->priv->sink_combox));
+ parole_conf_dialog_add_clutter_sink(self, GTK_COMBO_BOX(self->priv->sink_combox));
#endif
- self->priv->backend_infobar = GTK_WIDGET (gtk_builder_get_object (builder, "backend-infobar"));
+ self->priv->backend_infobar = GTK_WIDGET(gtk_builder_get_object(builder, "backend-infobar"));
- parole_conf_dialog_set_defaults (self);
+ parole_conf_dialog_set_defaults(self);
- with_display = parole_gst_get_is_xvimage_sink (PAROLE_GST (parole_gst_get ()));
+ with_display = parole_gst_get_is_xvimage_sink(PAROLE_GST(parole_gst_get()));
if ( !with_display ) {
- gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "frame-display")), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "frame-display")), FALSE);
} else {
gint brightness_value;
gint contrast_value;
gint hue_value;
gint saturation_value;
- self->priv->brightness = GTK_WIDGET (gtk_builder_get_object (builder, "brightness"));
- self->priv->contrast = GTK_WIDGET (gtk_builder_get_object (builder, "contrast"));
- self->priv->hue = GTK_WIDGET (gtk_builder_get_object (builder, "hue"));
- self->priv->saturation = GTK_WIDGET (gtk_builder_get_object (builder, "saturation"));
+ self->priv->brightness = GTK_WIDGET(gtk_builder_get_object(builder, "brightness"));
+ self->priv->contrast = GTK_WIDGET(gtk_builder_get_object(builder, "contrast"));
+ self->priv->hue = GTK_WIDGET(gtk_builder_get_object(builder, "hue"));
+ self->priv->saturation = GTK_WIDGET(gtk_builder_get_object(builder, "saturation"));
- gtk_range_set_range (GTK_RANGE (self->priv->brightness), -1000, 1000);
- gtk_range_set_range (GTK_RANGE (self->priv->contrast), -1000, 1000);
- gtk_range_set_range (GTK_RANGE (self->priv->saturation), -1000, 1000);
- gtk_range_set_range (GTK_RANGE (self->priv->hue), -1000, 1000);
- gtk_scale_add_mark (GTK_SCALE (self->priv->brightness), 0, GTK_POS_BOTTOM, NULL);
- gtk_scale_add_mark (GTK_SCALE (self->priv->contrast), 0, GTK_POS_BOTTOM, NULL);
- gtk_scale_add_mark (GTK_SCALE (self->priv->saturation), 0, GTK_POS_BOTTOM, NULL);
- gtk_scale_add_mark (GTK_SCALE (self->priv->hue), 0, GTK_POS_BOTTOM, NULL);
+ gtk_range_set_range(GTK_RANGE(self->priv->brightness), -1000, 1000);
+ gtk_range_set_range(GTK_RANGE(self->priv->contrast), -1000, 1000);
+ gtk_range_set_range(GTK_RANGE(self->priv->saturation), -1000, 1000);
+ gtk_range_set_range(GTK_RANGE(self->priv->hue), -1000, 1000);
+ gtk_scale_add_mark(GTK_SCALE(self->priv->brightness), 0, GTK_POS_BOTTOM, NULL);
+ gtk_scale_add_mark(GTK_SCALE(self->priv->contrast), 0, GTK_POS_BOTTOM, NULL);
+ gtk_scale_add_mark(GTK_SCALE(self->priv->saturation), 0, GTK_POS_BOTTOM, NULL);
+ gtk_scale_add_mark(GTK_SCALE(self->priv->hue), 0, GTK_POS_BOTTOM, NULL);
/* Set the step increment on the sliders to make them keyboard friendly */
g_value_init(&step_increment, G_TYPE_DOUBLE);
g_value_set_double(&step_increment, 10.0);
- adjustment = gtk_range_get_adjustment(GTK_RANGE (self->priv->brightness));
+ adjustment = gtk_range_get_adjustment(GTK_RANGE(self->priv->brightness));
g_object_set_property(G_OBJECT(adjustment), "step-increment", &step_increment);
- adjustment = gtk_range_get_adjustment(GTK_RANGE (self->priv->contrast));
+ adjustment = gtk_range_get_adjustment(GTK_RANGE(self->priv->contrast));
g_object_set_property(G_OBJECT(adjustment), "step-increment", &step_increment);
- adjustment = gtk_range_get_adjustment(GTK_RANGE (self->priv->hue));
+ adjustment = gtk_range_get_adjustment(GTK_RANGE(self->priv->hue));
g_object_set_property(G_OBJECT(adjustment), "step-increment", &step_increment);
- adjustment = gtk_range_get_adjustment(GTK_RANGE (self->priv->saturation));
+ adjustment = gtk_range_get_adjustment(GTK_RANGE(self->priv->saturation));
g_object_set_property(G_OBJECT(adjustment), "step-increment", &step_increment);
- g_object_get (G_OBJECT (self->priv->conf),
+ g_object_get(G_OBJECT(self->priv->conf),
"brightness", &brightness_value,
"contrast", &contrast_value,
"hue", &hue_value,
"saturation", &saturation_value,
NULL);
- gtk_range_set_value (GTK_RANGE (self->priv->brightness), brightness_value);
- gtk_range_set_value (GTK_RANGE (self->priv->contrast), contrast_value);
- gtk_range_set_value (GTK_RANGE (self->priv->hue), hue_value);
- gtk_range_set_value (GTK_RANGE (self->priv->saturation), saturation_value);
+ gtk_range_set_value(GTK_RANGE(self->priv->brightness), brightness_value);
+ gtk_range_set_value(GTK_RANGE(self->priv->contrast), contrast_value);
+ gtk_range_set_value(GTK_RANGE(self->priv->hue), hue_value);
+ gtk_range_set_value(GTK_RANGE(self->priv->saturation), saturation_value);
}
/* General/Video/Disable screensaver while playing movies */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "reset-saver"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "reset-saver",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "reset-saver"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "reset-saver",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* General/Audio/Enable visualization while playing audio file */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "enable-vis"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "vis-enabled",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "enable-vis"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "vis-enabled",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
g_signal_connect(G_OBJECT(switch_widget), "notify::active", G_CALLBACK(parole_conf_dialog_enable_vis_changed_cb), self);
/* General/Keyboard/Enable keyboard multimedia keys */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "multimedia-keys"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "multimedia-keys",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "multimedia-keys"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "multimedia-keys",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Always replace playlist with opened files */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "replace-playlist"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "replace-playlist",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "replace-playlist"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "replace-playlist",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Check and remove duplicate media entries */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "remove-duplicated"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "remove-duplicated",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "remove-duplicated"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "remove-duplicated",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Start playing opened files */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "start-playing-opened"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "play-opened-files",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "start-playing-opened"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "play-opened-files",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Remember playlist */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "remember-playlist"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "remember-playlist",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "remember-playlist"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "remember-playlist",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Subtitles/Automatically show subtitles when playing movie file */
- switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "enable-subtitle"));
- g_object_bind_property(G_OBJECT (self->priv->conf), "enable-subtitle",
+ switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "enable-subtitle"));
+ g_object_bind_property(G_OBJECT(self->priv->conf), "enable-subtitle",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
g_signal_connect(G_OBJECT(dialog), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
- gtk_builder_connect_signals (builder, self);
+ gtk_builder_connect_signals(builder, self);
- g_object_unref (builder);
+ g_object_unref(builder);
- gtk_widget_show (dialog);
+ gtk_widget_show(dialog);
}
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 5aafd2a..953b41c 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -88,22 +88,22 @@ enum
-static void parole_conf_finalize (GObject *object);
-static void parole_conf_get_property (GObject *object,
+static void parole_conf_finalize(GObject *object);
+static void parole_conf_get_property(GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
gchar
-*parole_conf_map_xfconf_property_name (const gchar *prop_name);
-static void parole_conf_set_property (GObject *object,
+*parole_conf_map_xfconf_property_name(const gchar *prop_name);
+static void parole_conf_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
-static void parole_conf_prop_changed (XfconfChannel *channel,
+static void parole_conf_prop_changed(XfconfChannel *channel,
const gchar *prop_name,
const GValue *value,
ParoleConf *conf);
-static void parole_conf_load_rc_file (ParoleConf *conf);
+static void parole_conf_load_rc_file(ParoleConf *conf);
@@ -128,7 +128,7 @@ static gboolean no_xfconf = FALSE;
-G_DEFINE_TYPE (ParoleConf, parole_conf, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleConf, parole_conf, G_TYPE_OBJECT)
@@ -141,12 +141,12 @@ G_DEFINE_TYPE (ParoleConf, parole_conf, G_TYPE_OBJECT)
*
* Write property-values to the Xfconf channel.
**/
-static void parole_conf_set_property (GObject *object,
+static void parole_conf_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- ParoleConf *conf = PAROLE_CONF (object);
+ ParoleConf *conf = PAROLE_CONF(object);
GValue dst = { 0, };
gchar prop_name[64];
const gchar *xfconf_nick;
@@ -163,28 +163,28 @@ static void parole_conf_set_property (GObject *object,
xfconf_nick = g_strdup_printf("%s", g_param_spec_get_nick(pspec));
/* freeze */
- g_signal_handler_block (conf->channel, conf->property_changed_id);
+ g_signal_handler_block(conf->channel, conf->property_changed_id);
- if (G_VALUE_HOLDS_ENUM (value)) {
+ if (G_VALUE_HOLDS_ENUM(value)) {
/* convert into a string */
- g_value_init (&dst, G_TYPE_STRING);
+ g_value_init(&dst, G_TYPE_STRING);
if (g_value_transform (value, &dst))
- xfconf_channel_set_property (conf->channel, xfconf_nick, &dst);
- g_value_unset (&dst);
- } else if (G_VALUE_HOLDS (value, G_TYPE_STRV)) {
+ xfconf_channel_set_property(conf->channel, xfconf_nick, &dst);
+ g_value_unset(&dst);
+ } else if (G_VALUE_HOLDS(value, G_TYPE_STRV)) {
/* convert to a GValue GPtrArray in xfconf */
- array = g_value_get_boxed (value);
+ array = g_value_get_boxed(value);
if (array != NULL && *array != NULL)
- xfconf_channel_set_string_list (conf->channel, xfconf_nick, (const gchar * const *) array);
+ xfconf_channel_set_string_list(conf->channel, xfconf_nick, (const gchar * const *)array);
else
- xfconf_channel_reset_property (conf->channel, xfconf_nick, FALSE);
+ xfconf_channel_reset_property(conf->channel, xfconf_nick, FALSE);
} else {
/* other types we support directly */
- xfconf_channel_set_property (conf->channel, xfconf_nick, value);
+ xfconf_channel_set_property(conf->channel, xfconf_nick, value);
}
/* thaw */
- g_signal_handler_unblock (conf->channel, conf->property_changed_id);
+ g_signal_handler_unblock(conf->channel, conf->property_changed_id);
/* now we can notify the plugins */
switch (prop_id)
@@ -211,12 +211,12 @@ static void parole_conf_set_property (GObject *object,
*
* Read property-values from the Xfconf channel
**/
-static void parole_conf_get_property (GObject *object,
+static void parole_conf_get_property(GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- ParoleConf *conf = PAROLE_CONF (object);
+ ParoleConf *conf = PAROLE_CONF(object);
GValue src = { 0, };
gchar prop_name[64];
const gchar *xfconf_nick;
@@ -225,7 +225,7 @@ static void parole_conf_get_property (GObject *object,
/* only set defaults if channel is not set */
if (G_UNLIKELY (conf->channel == NULL))
{
- g_param_value_set_default (pspec, value);
+ g_param_value_set_default(pspec, value);
return;
}
@@ -235,24 +235,24 @@ static void parole_conf_get_property (GObject *object,
/* store xfconf values using the spec nick */
xfconf_nick = g_strdup_printf("%s", g_param_spec_get_nick(pspec));
- if (G_VALUE_TYPE (value) == G_TYPE_STRV) {
+ if (G_VALUE_TYPE(value) == G_TYPE_STRV) {
/* handle arrays directly since we cannot transform those */
- array = xfconf_channel_get_string_list (conf->channel, xfconf_nick);
- g_value_take_boxed (value, array);
- } else if (xfconf_channel_get_property (conf->channel, xfconf_nick, &src)) {
+ array = xfconf_channel_get_string_list(conf->channel, xfconf_nick);
+ g_value_take_boxed(value, array);
+ } else if (xfconf_channel_get_property(conf->channel, xfconf_nick, &src)) {
if (G_VALUE_TYPE (value) == G_VALUE_TYPE (&src))
- g_value_copy (&src, value);
+ g_value_copy(&src, value);
else if (!g_value_transform (&src, value))
- g_printerr ("Parole: Failed to transform property %s\n", prop_name);
- g_value_unset (&src);
+ g_printerr("Parole: Failed to transform property %s\n", prop_name);
+ g_value_unset(&src);
} else {
/* value is not found, return default */
- g_param_value_set_default (pspec, value);
+ g_param_value_set_default(pspec, value);
}
}
/* Facilitate the conversion from xfconf property name to parole property name */
-gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+gchar *parole_conf_map_xfconf_property_name(const gchar *prop_name)
{
gchar *value = NULL;
if (g_strcmp0(prop_name, "/audio/visualization-enabled") == 0)
@@ -325,7 +325,7 @@ gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
*
* Event handler for when a property is modified.
**/
-static void parole_conf_prop_changed (XfconfChannel *channel,
+static void parole_conf_prop_changed(XfconfChannel *channel,
const gchar *prop_name,
const GValue *value,
ParoleConf *conf)
@@ -333,9 +333,9 @@ static void parole_conf_prop_changed (XfconfChannel *channel,
GParamSpec *pspec;
/* check if the property exists and emit change */
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf), parole_conf_map_xfconf_property_name(prop_name));
+ pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(conf), parole_conf_map_xfconf_property_name(prop_name));
if (G_LIKELY (pspec != NULL))
- g_object_notify_by_pspec (G_OBJECT (conf), pspec);
+ g_object_notify_by_pspec(G_OBJECT(conf), pspec);
g_debug("Propchange:%s,%p", prop_name, pspec);
}
@@ -347,14 +347,14 @@ static void parole_conf_prop_changed (XfconfChannel *channel,
* Finalize a #ParoleConf instance.
**/
static void
-parole_conf_finalize (GObject *object)
+parole_conf_finalize(GObject *object)
{
- ParoleConf *conf = PAROLE_CONF (object);
+ ParoleConf *conf = PAROLE_CONF(object);
/* disconnect from the updates */
- g_signal_handler_disconnect (conf->channel, conf->property_changed_id);
+ g_signal_handler_disconnect(conf->channel, conf->property_changed_id);
- (*G_OBJECT_CLASS (parole_conf_parent_class)->finalize) (object);
+(*G_OBJECT_CLASS(parole_conf_parent_class)->finalize)(object);
}
/**
@@ -365,10 +365,10 @@ parole_conf_finalize (GObject *object)
* Transform a #GValue string into a #GValue boolean.
**/
static void
-transform_string_to_boolean (const GValue *src,
+transform_string_to_boolean(const GValue *src,
GValue *dst)
{
- g_value_set_boolean (dst, !g_strcmp0 (g_value_get_string (src), "TRUE"));
+ g_value_set_boolean(dst, !g_strcmp0(g_value_get_string(src), "TRUE"));
}
/**
@@ -379,10 +379,10 @@ transform_string_to_boolean (const GValue *src,
* Transform a #GValue string into a #GValue int.
**/
static void
-transform_string_to_int (const GValue *src,
+transform_string_to_int(const GValue *src,
GValue *dst)
{
- g_value_set_int (dst, strtol (g_value_get_string (src), NULL, 10));
+ g_value_set_int(dst, strtol(g_value_get_string(src), NULL, 10));
}
/**
@@ -393,18 +393,18 @@ transform_string_to_int (const GValue *src,
* Transform a #GValue string into a #GValue enum.
**/
static void
-transform_string_to_enum (const GValue *src,
+transform_string_to_enum(const GValue *src,
GValue *dst)
{
GEnumClass *genum_class;
GEnumValue *genum_value;
- genum_class = g_type_class_peek (G_VALUE_TYPE (dst));
- genum_value = g_enum_get_value_by_name (genum_class, g_value_get_string (src));
+ genum_class = g_type_class_peek(G_VALUE_TYPE(dst));
+ genum_value = g_enum_get_value_by_name(genum_class, g_value_get_string(src));
if (G_UNLIKELY (genum_value == NULL))
genum_value = genum_class->values;
- g_value_set_enum (dst, genum_value->value);
+ g_value_set_enum(dst, genum_value->value);
}
/**
@@ -414,9 +414,9 @@ transform_string_to_enum (const GValue *src,
* Initialize a base #ParoleConfClass instance.
**/
static void
-parole_conf_class_init (ParoleConfClass *klass)
+parole_conf_class_init(ParoleConfClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_conf_finalize;
@@ -424,13 +424,13 @@ parole_conf_class_init (ParoleConfClass *klass)
object_class->set_property = parole_conf_set_property;
if (!g_value_type_transformable (G_TYPE_STRING, G_TYPE_INT))
- g_value_register_transform_func (G_TYPE_STRING, G_TYPE_INT, transform_string_to_int);
+ g_value_register_transform_func(G_TYPE_STRING, G_TYPE_INT, transform_string_to_int);
if (!g_value_type_transformable (G_TYPE_STRING, G_TYPE_BOOLEAN))
- g_value_register_transform_func (G_TYPE_STRING, G_TYPE_BOOLEAN, transform_string_to_boolean);
+ g_value_register_transform_func(G_TYPE_STRING, G_TYPE_BOOLEAN, transform_string_to_boolean);
if (!g_value_type_transformable (G_TYPE_STRING, GST_ENUM_TYPE_ASPECT_RATIO))
- g_value_register_transform_func (G_TYPE_STRING, GST_ENUM_TYPE_ASPECT_RATIO, transform_string_to_enum);
+ g_value_register_transform_func(G_TYPE_STRING, GST_ENUM_TYPE_ASPECT_RATIO, transform_string_to_enum);
/**
* ParoleConf:vis-enabled:
@@ -439,9 +439,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If visualizations are enabled.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_VIS_ENABLED,
- g_param_spec_boolean ("vis-enabled",
+ g_param_spec_boolean("vis-enabled",
"/audio/visualization-enabled",
NULL,
FALSE,
@@ -454,9 +454,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Name of the selected visualization.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_VIS_NAME,
- g_param_spec_string ("vis-name",
+ g_param_spec_string("vis-name",
"/audio/visualization-name",
NULL,
"none",
@@ -469,9 +469,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Audio volume level.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_VOLUME,
- g_param_spec_int ("volume",
+ g_param_spec_int("volume",
"/audio/volume",
NULL,
0,
@@ -486,9 +486,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Path to directory containing last used media.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_MEDIA_CHOOSER_FOLDER,
- g_param_spec_string ("media-chooser-folder",
+ g_param_spec_string("media-chooser-folder",
"/folders/last-used-media",
NULL,
"none",
@@ -501,9 +501,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If multimedia keys are enabled for controlling playback.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_MULTIMEDIA_KEYS,
- g_param_spec_boolean ("multimedia-keys",
+ g_param_spec_boolean("multimedia-keys",
"/parole/multimedia-keys",
NULL,
TRUE,
@@ -516,9 +516,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* List of enabled plugins.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_PLUGINS,
- g_param_spec_string ("plugins",
+ g_param_spec_string("plugins",
"/parole/plugins",
NULL,
"none",
@@ -531,9 +531,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If openening a directory should also open subdirectories.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SCAN_FOLDER_RECURSIVELY,
- g_param_spec_boolean ("scan-recursive",
+ g_param_spec_boolean("scan-recursive",
"/parole/scan-recursive",
NULL,
TRUE,
@@ -546,9 +546,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If the playlist should be persistent across application sessions.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_REMEMBER_PLAYLIST,
- g_param_spec_boolean ("remember-playlist",
+ g_param_spec_boolean("remember-playlist",
"/playlist/remember-playlist",
NULL,
FALSE,
@@ -561,9 +561,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If duplicate playlist entries should be removed from the playlist.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_REMOVE_DUPLICATED_PLAYLIST_ENTRIES,
- g_param_spec_boolean ("remove-duplicated",
+ g_param_spec_boolean("remove-duplicated",
"/playlist/remove-duplicates",
NULL,
FALSE,
@@ -576,9 +576,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If the playlist should automatically repeat when finished.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_REPEAT,
- g_param_spec_boolean ("repeat",
+ g_param_spec_boolean("repeat",
"/playlist/repeat",
NULL,
FALSE,
@@ -592,9 +592,9 @@ parole_conf_class_init (ParoleConfClass *klass)
* If the playlist should be replaced (as opposed to being appended to)
* when files are opened.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_REPLACE_PLAYLIST,
- g_param_spec_boolean ("replace-playlist",
+ g_param_spec_boolean("replace-playlist",
"/playlist/replace-playlist",
NULL,
FALSE,
@@ -607,9 +607,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If the playlist is shown or hidden.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SHOWHIDE_PLAYLIST,
- g_param_spec_boolean ("showhide-playlist",
+ g_param_spec_boolean("showhide-playlist",
"/playlist/show-playlist",
NULL,
FALSE,
@@ -622,9 +622,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If the playlist should be played in shuffled order.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SHUFFLE,
- g_param_spec_boolean ("shuffle",
+ g_param_spec_boolean("shuffle",
"/playlist/shuffle",
NULL,
FALSE,
@@ -638,9 +638,9 @@ parole_conf_class_init (ParoleConfClass *klass)
* If files should automatically play when opened, or just be appended to
* the playlist.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_START_PLAYING_OPENED_FILES,
- g_param_spec_boolean ("play-opened-files",
+ g_param_spec_boolean("play-opened-files",
"/playlist/play-opened-files",
NULL,
TRUE,
@@ -653,9 +653,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If subtitles are enabled.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SUBTITLE_ENABLED,
- g_param_spec_boolean ("enable-subtitle",
+ g_param_spec_boolean("enable-subtitle",
"/subtitles/enabled",
NULL,
TRUE,
@@ -668,9 +668,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Encoding for subtitle text.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SUBTITLE_ENCODING,
- g_param_spec_string ("subtitle-encoding",
+ g_param_spec_string("subtitle-encoding",
"/subtitles/encoding",
NULL,
"UTF-8",
@@ -683,9 +683,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Name and size of the subtitle font size.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SUBTITLE_FONT,
- g_param_spec_string ("subtitle-font",
+ g_param_spec_string("subtitle-font",
"/subtitles/font",
NULL,
"Sans Bold 20",
@@ -698,9 +698,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* GStreamer videosink to use for output.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_VIDEO_SINK,
- g_param_spec_string ("videosink",
+ g_param_spec_string("videosink",
"/video/videosink",
NULL,
"xvimagesink",
@@ -713,9 +713,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Video aspect ratio.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_ASPECT_RATIO,
- g_param_spec_enum ("aspect-ratio",
+ g_param_spec_enum("aspect-ratio",
"/video/aspect-ratio",
NULL,
GST_ENUM_TYPE_ASPECT_RATIO,
@@ -729,9 +729,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Video brightness level.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_BRIGHTNESS,
- g_param_spec_int ("brightness",
+ g_param_spec_int("brightness",
"/video/brightness",
NULL,
-1000,
@@ -746,9 +746,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Video contrast level.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_CONTRAST,
- g_param_spec_int ("contrast",
+ g_param_spec_int("contrast",
"/video/contrast",
NULL,
-1000,
@@ -763,9 +763,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If screensavers should be disabled when a video is playing.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_DISABLE_SCREEN_SAVER,
- g_param_spec_boolean ("reset-saver",
+ g_param_spec_boolean("reset-saver",
"/video/disable-screensaver",
NULL,
TRUE,
@@ -778,9 +778,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Video hue level.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_HUE,
- g_param_spec_int ("hue",
+ g_param_spec_int("hue",
"/video/hue",
NULL,
-1000,
@@ -795,9 +795,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Video saturation level.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_SATURATION,
- g_param_spec_int ("saturation",
+ g_param_spec_int("saturation",
"/video/saturation",
NULL,
-1000,
@@ -812,9 +812,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Saved height of the application window.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_WINDOW_HEIGHT,
- g_param_spec_int ("window-height",
+ g_param_spec_int("window-height",
"/window/height",
NULL,
1,
@@ -829,9 +829,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If Parole should start minimized.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_WINDOW_MINIMIZED,
- g_param_spec_boolean ("minimized",
+ g_param_spec_boolean("minimized",
"/window/minimized",
NULL,
FALSE,
@@ -844,9 +844,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* If Parole should start maximized.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_WINDOW_MINIMIZED,
- g_param_spec_boolean ("window-maximized",
+ g_param_spec_boolean("window-maximized",
"/window/maximized",
NULL,
FALSE,
@@ -859,9 +859,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Saved width of the application window.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_WINDOW_WIDTH,
- g_param_spec_int ("window-width",
+ g_param_spec_int("window-width",
"/window/width",
NULL,
1,
@@ -876,9 +876,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Control the timeout for the playback controls to hide.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_HIDE_CONTROLS_TIMEOUT,
- g_param_spec_int ("hide-controls-timeout",
+ g_param_spec_int("hide-controls-timeout",
"/hide-controls-timeout",
NULL,
1,
@@ -893,9 +893,9 @@ parole_conf_class_init (ParoleConfClass *klass)
*
* Persistently hide the menubar.
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_ALWAYS_HIDE_MENUBAR,
- g_param_spec_boolean ("always-hide-menubar",
+ g_param_spec_boolean("always-hide-menubar",
"/always-hide-menubar",
NULL,
FALSE,
@@ -910,7 +910,7 @@ parole_conf_class_init (ParoleConfClass *klass)
* existing settings into Xfconf and the rc file will no longer be needed.
**/
static void
-parole_conf_load_rc_file (ParoleConf *conf)
+parole_conf_load_rc_file(ParoleConf *conf)
{
GParamSpec **pspecs;
GParamSpec *pspec;
@@ -923,18 +923,18 @@ parole_conf_load_rc_file (ParoleConf *conf)
const gchar *nick;
/* look for preferences */
- rc = parole_get_resource_file (PAROLE_RC_GROUP_GENERAL, TRUE);
+ rc = parole_get_resource_file(PAROLE_RC_GROUP_GENERAL, TRUE);
/* Check whether rc file exists */
if (G_UNLIKELY (rc == NULL))
{
- g_debug ("Unable to lookup rc file in : %s\n", PAROLE_RESOURCE_FILE);
+ g_debug("Unable to lookup rc file in : %s\n", PAROLE_RESOURCE_FILE);
return;
}
- xfce_rc_set_group (rc, "Configuration");
+ xfce_rc_set_group(rc, "Configuration");
- pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (conf), &nspecs);
+ pspecs = g_object_class_list_properties(G_OBJECT_GET_CLASS(conf), &nspecs);
/* Load each property */
for (n = 0; n < nspecs; ++n)
@@ -942,12 +942,12 @@ parole_conf_load_rc_file (ParoleConf *conf)
pspec = pspecs[n];
/* continue if the nick is null */
- nick = g_param_spec_get_nick (pspec);
+ nick = g_param_spec_get_nick(pspec);
if (G_UNLIKELY (nick == NULL))
continue;
/* read the value from the rc file */
- string = xfce_rc_read_entry (rc, nick, NULL);
+ string = xfce_rc_read_entry(rc, nick, NULL);
if (G_UNLIKELY (string == NULL))
continue;
@@ -957,28 +957,28 @@ parole_conf_load_rc_file (ParoleConf *conf)
continue;
/* source property */
- g_value_init (&src, G_TYPE_STRING);
- g_value_set_static_string (&src, string);
+ g_value_init(&src, G_TYPE_STRING);
+ g_value_set_static_string(&src, string);
/* store string and enums directly */
- if (G_IS_PARAM_SPEC_STRING (pspec) || G_IS_PARAM_SPEC_ENUM (pspec)) {
- xfconf_channel_set_property (conf->channel, prop_name, &src);
- } else if (g_value_type_transformable (G_TYPE_STRING, G_PARAM_SPEC_VALUE_TYPE (pspec))) {
- g_value_init (&dst, G_PARAM_SPEC_VALUE_TYPE (pspec));
+ if (G_IS_PARAM_SPEC_STRING(pspec) || G_IS_PARAM_SPEC_ENUM(pspec)) {
+ xfconf_channel_set_property(conf->channel, prop_name, &src);
+ } else if (g_value_type_transformable(G_TYPE_STRING, G_PARAM_SPEC_VALUE_TYPE(pspec))) {
+ g_value_init(&dst, G_PARAM_SPEC_VALUE_TYPE(pspec));
if (g_value_transform (&src, &dst))
- xfconf_channel_set_property (conf->channel, prop_name, &dst);
- g_value_unset (&dst);
+ xfconf_channel_set_property(conf->channel, prop_name, &dst);
+ g_value_unset(&dst);
} else {
- g_warning ("Failed to migrate property \"%s\"", g_param_spec_get_name (pspec));
+ g_warning("Failed to migrate property \"%s\"", g_param_spec_get_name(pspec));
}
- g_value_unset (&src);
+ g_value_unset(&src);
}
- g_free (pspecs);
- xfce_rc_close (rc);
+ g_free(pspecs);
+ xfce_rc_close(rc);
- g_print ("\n\n"
+ g_print("\n\n"
"Your Parole settings have been migrated to Xfconf.\n"
"The config file \"%s\"\n"
"is not used anymore.\n\n", PAROLE_RESOURCE_FILE);
@@ -991,7 +991,7 @@ parole_conf_load_rc_file (ParoleConf *conf)
* Initialize a #ParoleConf instance.
**/
static void
-parole_conf_init (ParoleConf *conf)
+parole_conf_init(ParoleConf *conf)
{
const gchar check_prop[] = "/subtitles/font";
@@ -1000,22 +1000,22 @@ parole_conf_init (ParoleConf *conf)
return;
/* load the channel */
- conf->channel = xfconf_channel_get ("parole");
+ conf->channel = xfconf_channel_get("parole");
/* check one of the property to see if there are values */
if (!xfconf_channel_has_property (conf->channel, check_prop))
{
/* try to load the old config file */
- parole_conf_load_rc_file (conf);
+ parole_conf_load_rc_file(conf);
/* set the string we check */
if (!xfconf_channel_has_property (conf->channel, check_prop))
- xfconf_channel_set_string (conf->channel, check_prop, "Sans Bold 20");
+ xfconf_channel_set_string(conf->channel, check_prop, "Sans Bold 20");
}
conf->property_changed_id =
- g_signal_connect (G_OBJECT (conf->channel), "property-changed",
- G_CALLBACK (parole_conf_prop_changed), conf);
+ g_signal_connect(G_OBJECT(conf->channel), "property-changed",
+ G_CALLBACK(parole_conf_prop_changed), conf);
}
/**
@@ -1024,13 +1024,13 @@ parole_conf_init (ParoleConf *conf)
* Create a new #ParoleConf instance.
**/
ParoleConf *
-parole_conf_new (void)
+parole_conf_new(void)
{
if ( parole_conf_object != NULL ) {
- g_object_ref (parole_conf_object);
+ g_object_ref(parole_conf_object);
} else {
- parole_conf_object = g_object_new (PAROLE_TYPE_CONF, NULL);
- g_object_add_weak_pointer (parole_conf_object, &parole_conf_object);
+ parole_conf_object = g_object_new(PAROLE_TYPE_CONF, NULL);
+ g_object_add_weak_pointer(parole_conf_object, &parole_conf_object);
}
return PAROLE_CONF (parole_conf_object);
@@ -1044,12 +1044,12 @@ parole_conf_new (void)
* Return a boolean value from a property.
**/
gboolean
-parole_conf_get_property_bool (ParoleConf *conf,
+parole_conf_get_property_bool(ParoleConf *conf,
const gchar *name)
{
gboolean value;
- g_object_get (G_OBJECT (conf),
+ g_object_get(G_OBJECT(conf),
name, &value,
NULL);
@@ -1057,14 +1057,14 @@ parole_conf_get_property_bool (ParoleConf *conf,
}
void
-parole_conf_write_entry_list (ParoleConf *conf, const gchar *name, gchar **value)
+parole_conf_write_entry_list(ParoleConf *conf, const gchar *name, gchar **value)
{
gchar *value_string = "";
guint num = 0, i, count = 0;
TRACE("START");
- num = g_strv_length (value);
+ num = g_strv_length(value);
for ( i = 0; i < num; i++ )
{
if (value[i] && g_strcmp0(value[i], "") != 0 && g_strcmp0(value[i], "none") != 0 )
@@ -1072,12 +1072,12 @@ parole_conf_write_entry_list (ParoleConf *conf, const gchar *name, gchar **value
if (count == 0)
value_string = g_strdup(value[i]);
else
- value_string = g_strconcat (value_string, ";", value[i], NULL);
+ value_string = g_strconcat(value_string, ";", value[i], NULL);
count++;
}
}
- g_object_set (G_OBJECT (conf),
+ g_object_set(G_OBJECT(conf),
name, value_string,
NULL);
@@ -1086,14 +1086,14 @@ parole_conf_write_entry_list (ParoleConf *conf, const gchar *name, gchar **value
}
gchar**
-parole_conf_read_entry_list (ParoleConf *conf, const gchar *name)
+parole_conf_read_entry_list(ParoleConf *conf, const gchar *name)
{
gchar *value_string;
gchar **ret_val = NULL;
TRACE("START");
- g_object_get (G_OBJECT (conf),
+ g_object_get(G_OBJECT(conf),
name, &value_string,
NULL);
@@ -1108,7 +1108,7 @@ parole_conf_read_entry_list (ParoleConf *conf, const gchar *name)
void
-parole_conf_xfconf_init_failed (void)
+parole_conf_xfconf_init_failed(void)
{
no_xfconf = TRUE;
}
diff --git a/src/parole-disc.c b/src/parole-disc.c
index f722e50..0119f5d 100644
--- a/src/parole-disc.c
+++ b/src/parole-disc.c
@@ -46,10 +46,10 @@
#include "parole-builder.h"
#include "gmarshal.h"
-static void parole_disc_finalize (GObject *object);
+static void parole_disc_finalize(GObject *object);
#define PAROLE_DISC_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_DISC, ParoleDiscPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_DISC, ParoleDiscPrivate))
struct ParoleDiscPrivate
{
@@ -70,7 +70,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (ParoleDisc, parole_disc, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleDisc, parole_disc, G_TYPE_OBJECT)
typedef struct
{
@@ -87,19 +87,19 @@ typedef struct
* Free the mount-point.
**/
static void
-free_mount_data (gpointer data)
+free_mount_data(gpointer data)
{
MountData *mount;
mount = (MountData *) data;
if ( mount->uri )
- g_free (mount->uri);
+ g_free(mount->uri);
if ( mount->device )
- g_free (mount->device);
+ g_free(mount->device);
- g_free (mount);
+ g_free(mount);
}
@@ -109,14 +109,14 @@ parole_disc_set_label(ParoleDisc *disc, const gchar *label)
gchar *menu_label;
if ( g_strcmp0(label, _("Insert Disc")) != 0 ) {
- menu_label = g_strdup_printf ("%s '%s'", _("Play Disc"), label);
- g_signal_emit (G_OBJECT (disc), signals[LABEL_CHANGED], 0, label);
+ menu_label = g_strdup_printf("%s '%s'", _("Play Disc"), label);
+ g_signal_emit(G_OBJECT(disc), signals[LABEL_CHANGED], 0, label);
} else {
menu_label = g_strdup(label);
- g_signal_emit (G_OBJECT (disc), signals[LABEL_CHANGED], 0, label);
+ g_signal_emit(G_OBJECT(disc), signals[LABEL_CHANGED], 0, label);
}
- gtk_menu_item_set_label(GTK_MENU_ITEM (disc->priv->disc_menu_item), menu_label);
+ gtk_menu_item_set_label(GTK_MENU_ITEM(disc->priv->disc_menu_item), menu_label);
g_free(menu_label);
}
@@ -163,13 +163,13 @@ parole_disc_set_kind(ParoleDisc *disc, ParoleDiscKind kind)
* Callback function for when the CD/DVD menu item is activated.
**/
static void
-parole_disc_media_activate_cb (GtkWidget *widget, ParoleDisc *disc)
+parole_disc_media_activate_cb(GtkWidget *widget, ParoleDisc *disc)
{
MountData *data;
- data = g_object_get_data (G_OBJECT (widget), "mount-data");
+ data = g_object_get_data(G_OBJECT(widget), "mount-data");
- g_signal_emit (G_OBJECT (disc), signals[DISC_SELECTED], 0, data->uri, data->device);
+ g_signal_emit(G_OBJECT(disc), signals[DISC_SELECTED], 0, data->uri, data->device);
}
/**
@@ -182,19 +182,19 @@ parole_disc_media_activate_cb (GtkWidget *widget, ParoleDisc *disc)
* disc is detected.
**/
static void
-parole_disc_show_menu_item (ParoleDisc *disc, MountData *data, const gchar *label)
+parole_disc_show_menu_item(ParoleDisc *disc, MountData *data, const gchar *label)
{
- parole_disc_set_kind (disc, data->kind);
+ parole_disc_set_kind(disc, data->kind);
parole_disc_set_label(disc, label);
if (parole_disc_get_enabled(disc)) {
data->mi = disc->priv->disc_menu_item;
- g_object_set_data (G_OBJECT (data->mi),
+ g_object_set_data(G_OBJECT(data->mi),
"mount-data", data);
- g_signal_connect (data->mi, "activate",
- G_CALLBACK (parole_disc_media_activate_cb), disc);
+ g_signal_connect(data->mi, "activate",
+ G_CALLBACK(parole_disc_media_activate_cb), disc);
}
}
@@ -208,19 +208,19 @@ parole_disc_show_menu_item (ParoleDisc *disc, MountData *data, const gchar *labe
* Get data from the mount-point.
**/
static MountData *
-parole_disc_get_mount_data (ParoleDisc *disc,
+parole_disc_get_mount_data(ParoleDisc *disc,
const gchar *uri,
const gchar *device,
ParoleDiscKind kind)
{
MountData *data;
- data = g_new0 (MountData, 1);
+ data = g_new0(MountData, 1);
data->kind = kind;
data->uri = data->device = NULL;
- data->uri = g_strdup (uri);
- data->device = g_strdup (device);
+ data->uri = g_strdup(uri);
+ data->device = g_strdup(device);
return data;
}
@@ -234,7 +234,7 @@ parole_disc_get_mount_data (ParoleDisc *disc,
* Add the mounted disc to the "Media" menu.
**/
static void
-parole_disc_add_mount_to_menu (ParoleDisc *disc, GMount *mount, const gchar *device)
+parole_disc_add_mount_to_menu(ParoleDisc *disc, GMount *mount, const gchar *device)
{
GFile *file;
gchar **content_type;
@@ -242,50 +242,50 @@ parole_disc_add_mount_to_menu (ParoleDisc *disc, GMount *mount, const gchar *dev
ParoleDiscKind kind = PAROLE_DISC_UNKNOWN;
gchar *uri = NULL;
- file = g_mount_get_root (mount);
+ file = g_mount_get_root(mount);
if ( g_file_has_uri_scheme (file, "cdda") )
{
kind = PAROLE_DISC_CDDA;
- uri = g_strdup ("cdda://");
+ uri = g_strdup("cdda://");
goto got_cdda;
}
if ( g_file_has_uri_scheme (file, "dvd") )
{
kind = PAROLE_DISC_DVD;
- uri = g_strdup ("dvd:/");
+ uri = g_strdup("dvd:/");
goto got_cdda;
}
- content_type = g_content_type_guess_for_tree (file);
+ content_type = g_content_type_guess_for_tree(file);
/* Determine the type of disc */
for ( i = 0; content_type && content_type[i]; i++)
{
- TRACE ("Checking disc content type : %s", content_type[i]);
+ TRACE("Checking disc content type : %s", content_type[i]);
- if ( !g_strcmp0 (content_type[i], "x-content/video-dvd") ) {
+ if ( !g_strcmp0(content_type[i], "x-content/video-dvd") ) {
kind = PAROLE_DISC_DVD;
- uri = g_strdup ("dvd:/");
+ uri = g_strdup("dvd:/");
break;
- } else if ( !g_strcmp0 (content_type[i], "x-content/video-vcd") ) {
+ } else if ( !g_strcmp0(content_type[i], "x-content/video-vcd") ) {
kind = PAROLE_DISC_VCD;
- uri = g_strdup ("vcd:/");
+ uri = g_strdup("vcd:/");
break;
- } else if ( !g_strcmp0 (content_type[i], "x-content/video-svcd") ) {
+ } else if ( !g_strcmp0(content_type[i], "x-content/video-svcd") ) {
kind = PAROLE_DISC_SVCD;
- uri = g_strdup ("svcd:/");
+ uri = g_strdup("svcd:/");
break;
- } else if ( !g_strcmp0 (content_type[i], "x-content/audio-cdda") ) {
+ } else if ( !g_strcmp0(content_type[i], "x-content/audio-cdda") ) {
kind = PAROLE_DISC_CDDA;
- uri = g_strdup ("cdda://");
+ uri = g_strdup("cdda://");
break;
}
}
if ( content_type )
- g_strfreev (content_type);
+ g_strfreev(content_type);
got_cdda:
if ( kind != PAROLE_DISC_UNKNOWN )
@@ -293,19 +293,19 @@ got_cdda:
MountData *data;
gchar *name;
- name = g_mount_get_name (mount);
+ name = g_mount_get_name(mount);
- data = parole_disc_get_mount_data (disc, uri, device, kind);
- parole_disc_show_menu_item (disc, data, name);
+ data = parole_disc_get_mount_data(disc, uri, device, kind);
+ parole_disc_show_menu_item(disc, data, name);
if ( uri )
- g_free (uri);
+ g_free(uri);
- g_ptr_array_add (disc->priv->array, data);
- g_free (name);
+ g_ptr_array_add(disc->priv->array, data);
+ g_free(name);
}
- g_object_unref (file);
+ g_object_unref(file);
}
/**
@@ -317,7 +317,7 @@ got_cdda:
* Check the state of the drive.
**/
static void
-parole_disc_check_cdrom (ParoleDisc *disc, GVolume *volume, const gchar *device)
+parole_disc_check_cdrom(ParoleDisc *disc, GVolume *volume, const gchar *device)
{
#if defined(__linux__)
gint fd;
@@ -327,34 +327,34 @@ parole_disc_check_cdrom (ParoleDisc *disc, GVolume *volume, const gchar *device)
gchar *name;
- TRACE ("device : %s", device);
+ TRACE("device : %s", device);
if ( (fd = open (device, O_RDONLY)) < 0 )
{
- g_debug ("Failed to open device : %s", device);
+ g_debug("Failed to open device : %s", device);
disc->priv->needs_update = TRUE;
goto out;
}
- if ( (drive = ioctl (fd, CDROM_DRIVE_STATUS, NULL)) ) {
+ if ((drive = ioctl(fd, CDROM_DRIVE_STATUS, NULL))) {
if ( drive == CDS_DRIVE_NOT_READY ) {
- g_print ("Drive :%s is not yet ready\n", device);
+ g_print("Drive :%s is not yet ready\n", device);
disc->priv->needs_update = TRUE;
} else if ( drive == CDS_DISC_OK ) {
- if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) > 0 ) {
+ if ((drive = ioctl(fd, CDROM_DISC_STATUS, NULL)) > 0) {
if ( drive == CDS_AUDIO || drive == CDS_MIXED ) {
- data = parole_disc_get_mount_data (disc, "cdda://", device, PAROLE_DISC_CDDA);
+ data = parole_disc_get_mount_data(disc, "cdda://", device, PAROLE_DISC_CDDA);
- name = g_volume_get_name (volume);
+ name = g_volume_get_name(volume);
- parole_disc_show_menu_item (disc, data, name);
- g_ptr_array_add (disc->priv->array, data);
+ parole_disc_show_menu_item(disc, data, name);
+ g_ptr_array_add(disc->priv->array, data);
}
}
}
}
- close (fd);
+ close(fd);
out:
{}
#endif /* if defined(__linux__) */
@@ -369,36 +369,36 @@ out:
* Add the disc drive to the menu.
**/
static void
-parole_disc_add_drive (ParoleDisc *disc, GDrive *drive, const gchar *device)
+parole_disc_add_drive(ParoleDisc *disc, GDrive *drive, const gchar *device)
{
GList *list;
guint len;
guint i;
- list = g_drive_get_volumes (drive);
- len = g_list_length (list);
+ list = g_drive_get_volumes(drive);
+ len = g_list_length(list);
for ( i = 0; i < len; i++)
{
GVolume *volume;
GMount *mount;
- volume = g_list_nth_data (list, i);
- TRACE ("Volume name %s", g_volume_get_name (volume));
+ volume = g_list_nth_data(list, i);
+ TRACE("Volume name %s", g_volume_get_name(volume));
- mount = g_volume_get_mount (volume);
+ mount = g_volume_get_mount(volume);
if ( mount ) {
- TRACE ("Mount name : %s", g_mount_get_name (mount));
- parole_disc_add_mount_to_menu (disc, mount, device);
- g_object_unref (mount);
+ TRACE("Mount name : %s", g_mount_get_name(mount));
+ parole_disc_add_mount_to_menu(disc, mount, device);
+ g_object_unref(mount);
} else {
/* Could be a cdda?*/
- parole_disc_check_cdrom (disc, volume, device);
+ parole_disc_check_cdrom(disc, volume, device);
}
}
- g_list_foreach (list, (GFunc) g_object_unref, NULL);
- g_list_free (list);
+ g_list_foreach(list, (GFunc)g_object_unref, NULL);
+ g_list_free(list);
}
/**
@@ -408,15 +408,15 @@ parole_disc_add_drive (ParoleDisc *disc, GDrive *drive, const gchar *device)
* Get the list of available drives and attempt to add each to the menu.
**/
static void
-parole_disc_get_drives (ParoleDisc *disc)
+parole_disc_get_drives(ParoleDisc *disc)
{
GList *list;
guint len;
guint i;
- list = g_volume_monitor_get_connected_drives (disc->priv->monitor);
+ list = g_volume_monitor_get_connected_drives(disc->priv->monitor);
- len = g_list_length (list);
+ len = g_list_length(list);
/*
* Set the update flag here because it can be set later to TRUE
@@ -429,20 +429,20 @@ parole_disc_get_drives (ParoleDisc *disc)
GDrive *drive;
gchar *device = NULL;
- drive = g_list_nth_data (list, i);
+ drive = g_list_nth_data(list, i);
/* FIXME what happens if there is more than one disc drive? */
if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
{
- device = g_drive_get_identifier (drive, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
- parole_disc_add_drive (disc, drive, device);
+ device = g_drive_get_identifier(drive, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+ parole_disc_add_drive(disc, drive, device);
if ( device )
- g_free (device);
+ g_free(device);
}
}
- g_list_foreach (list, (GFunc) g_object_unref, NULL);
- g_list_free (list);
+ g_list_foreach(list, (GFunc)g_object_unref, NULL);
+ g_list_free(list);
}
/**
@@ -454,10 +454,10 @@ parole_disc_get_drives (ParoleDisc *disc)
* needed, perform it when the menu item is activated.
**/
static void
-parole_disc_select_cb (GtkMenuItem *item, ParoleDisc *disc)
+parole_disc_select_cb(GtkMenuItem *item, ParoleDisc *disc)
{
if ( disc->priv->needs_update )
- parole_disc_get_drives (disc);
+ parole_disc_get_drives(disc);
}
/**
@@ -470,7 +470,7 @@ parole_disc_select_cb (GtkMenuItem *item, ParoleDisc *disc)
* to blank and tell the #ParoleDisc to check for updates.
**/
static void
-parole_disc_monitor_changed_cb (GVolumeMonitor *monitor, gpointer *device, ParoleDisc *disc)
+parole_disc_monitor_changed_cb(GVolumeMonitor *monitor, gpointer *device, ParoleDisc *disc)
{
parole_disc_set_kind(disc, PAROLE_DISC_UNKNOWN);
@@ -484,25 +484,25 @@ parole_disc_monitor_changed_cb (GVolumeMonitor *monitor, gpointer *device, Parol
* Initialize the #ParoleDiscClass.
**/
static void
-parole_disc_class_init (ParoleDiscClass *klass)
+parole_disc_class_init(ParoleDiscClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
signals[DISC_SELECTED] =
- g_signal_new ("disc-selected",
+ g_signal_new("disc-selected",
PAROLE_TYPE_DISC,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleDiscClass, disc_selected),
+ G_STRUCT_OFFSET(ParoleDiscClass, disc_selected),
NULL, NULL,
_gmarshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
signals[LABEL_CHANGED] =
- g_signal_new ("label-changed",
+ g_signal_new("label-changed",
PAROLE_TYPE_DISC,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleDiscClass, label_changed),
+ G_STRUCT_OFFSET(ParoleDiscClass, label_changed),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
@@ -519,44 +519,44 @@ parole_disc_class_init (ParoleDiscClass *klass)
* Initialize the disc monitor.
**/
static void
-parole_disc_init (ParoleDisc *disc)
+parole_disc_init(ParoleDisc *disc)
{
GtkBuilder *builder;
- disc->priv = PAROLE_DISC_GET_PRIVATE (disc);
+ disc->priv = PAROLE_DISC_GET_PRIVATE(disc);
- builder = parole_builder_get_main_interface ();
+ builder = parole_builder_get_main_interface();
- disc->priv->array = g_ptr_array_new ();
+ disc->priv->array = g_ptr_array_new();
disc->priv->needs_update = TRUE;
- disc->priv->monitor = g_volume_monitor_get ();
+ disc->priv->monitor = g_volume_monitor_get();
/* Connect the various disc signals */
- g_signal_connect (G_OBJECT (disc->priv->monitor), "volume-added",
- G_CALLBACK (parole_disc_monitor_changed_cb), disc);
+ g_signal_connect(G_OBJECT(disc->priv->monitor), "volume-added",
+ G_CALLBACK(parole_disc_monitor_changed_cb), disc);
- g_signal_connect (G_OBJECT (disc->priv->monitor), "volume-removed",
- G_CALLBACK (parole_disc_monitor_changed_cb), disc);
+ g_signal_connect(G_OBJECT(disc->priv->monitor), "volume-removed",
+ G_CALLBACK(parole_disc_monitor_changed_cb), disc);
- g_signal_connect (G_OBJECT (disc->priv->monitor), "mount-added",
- G_CALLBACK (parole_disc_monitor_changed_cb), disc);
+ g_signal_connect(G_OBJECT(disc->priv->monitor), "mount-added",
+ G_CALLBACK(parole_disc_monitor_changed_cb), disc);
- g_signal_connect (G_OBJECT (disc->priv->monitor), "mount-removed",
- G_CALLBACK (parole_disc_monitor_changed_cb), disc);
+ g_signal_connect(G_OBJECT(disc->priv->monitor), "mount-removed",
+ G_CALLBACK(parole_disc_monitor_changed_cb), disc);
- g_signal_connect (G_OBJECT (disc->priv->monitor), "drive-disconnected",
- G_CALLBACK (parole_disc_monitor_changed_cb), disc);
+ g_signal_connect(G_OBJECT(disc->priv->monitor), "drive-disconnected",
+ G_CALLBACK(parole_disc_monitor_changed_cb), disc);
- g_signal_connect (G_OBJECT (disc->priv->monitor), "drive-eject-button",
- G_CALLBACK (parole_disc_monitor_changed_cb), disc);
+ g_signal_connect(G_OBJECT(disc->priv->monitor), "drive-eject-button",
+ G_CALLBACK(parole_disc_monitor_changed_cb), disc);
- disc->priv->disc_menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "menu-open-disc"));
+ disc->priv->disc_menu_item = GTK_WIDGET(gtk_builder_get_object(builder, "menu-open-disc"));
- g_signal_connect (gtk_builder_get_object (builder, "media-menu"), "select",
- G_CALLBACK (parole_disc_select_cb), disc);
+ g_signal_connect(gtk_builder_get_object(builder, "media-menu"), "select",
+ G_CALLBACK(parole_disc_select_cb), disc);
- g_object_unref (builder);
+ g_object_unref(builder);
}
/**
@@ -566,18 +566,18 @@ parole_disc_init (ParoleDisc *disc)
* Finalize a #ParoleDisc object.
**/
static void
-parole_disc_finalize (GObject *object)
+parole_disc_finalize(GObject *object)
{
ParoleDisc *disc;
- disc = PAROLE_DISC (object);
+ disc = PAROLE_DISC(object);
- g_object_unref (disc->priv->monitor);
+ g_object_unref(disc->priv->monitor);
- g_ptr_array_foreach (disc->priv->array, (GFunc) free_mount_data, NULL);
- g_ptr_array_free (disc->priv->array, TRUE);
+ g_ptr_array_foreach(disc->priv->array, (GFunc)free_mount_data, NULL);
+ g_ptr_array_free(disc->priv->array, TRUE);
- G_OBJECT_CLASS (parole_disc_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_disc_parent_class)->finalize(object);
}
/**
@@ -586,9 +586,9 @@ parole_disc_finalize (GObject *object)
* Create a new #ParoleDisc instance.
**/
ParoleDisc *
-parole_disc_new (void)
+parole_disc_new(void)
{
ParoleDisc *disc = NULL;
- disc = g_object_new (PAROLE_TYPE_DISC, NULL);
+ disc = g_object_new(PAROLE_TYPE_DISC, NULL);
return disc;
}
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index 192597f..156d5e9 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -46,19 +46,19 @@
/*
* GtkBuilder Callbacks
*/
-void parole_media_chooser_add_clicked (GtkWidget *widget,
+void parole_media_chooser_add_clicked(GtkWidget *widget,
ParoleMediaChooser *chooser);
-void parole_media_chooser_close_clicked (GtkWidget *widget,
+void parole_media_chooser_close_clicked(GtkWidget *widget,
ParoleMediaChooser *chooser);
-void parole_media_chooser_destroy_cb (GtkWidget *widget,
+void parole_media_chooser_destroy_cb(GtkWidget *widget,
ParoleMediaChooser *chooser);
-void media_chooser_folder_changed_cb (GtkWidget *widget,
+void media_chooser_folder_changed_cb(GtkWidget *widget,
ParoleMediaChooser *chooser);
-void media_chooser_file_activate_cb (GtkFileChooser *filechooser,
+void media_chooser_file_activate_cb(GtkFileChooser *filechooser,
ParoleMediaChooser *chooser);
struct ParoleMediaChooser
@@ -74,10 +74,10 @@ struct ParoleMediaChooserClass
{
GObjectClass parent_class;
- void (*media_files_opened) (ParoleMediaChooser *chooser,
+ void(*media_files_opened)(ParoleMediaChooser *chooser,
GSList *list);
- void (*iso_opened) (ParoleMediaChooser *chooser,
+ void(*iso_opened)(ParoleMediaChooser *chooser,
gchar *filename);
};
@@ -90,26 +90,26 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (ParoleMediaChooser, parole_media_chooser, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleMediaChooser, parole_media_chooser, G_TYPE_OBJECT)
void
-media_chooser_folder_changed_cb (GtkWidget *widget, ParoleMediaChooser *chooser)
+media_chooser_folder_changed_cb(GtkWidget *widget, ParoleMediaChooser *chooser)
{
gchar *folder;
- folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (widget));
+ folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
if ( folder )
{
- g_object_set (G_OBJECT (chooser->conf),
+ g_object_set(G_OBJECT(chooser->conf),
"media-chooser-folder", folder,
NULL);
- g_free (folder);
+ g_free(folder);
}
}
/* Add one or more files from the filechooser-widget to the playlist */
static void
-parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
+parole_media_chooser_add(ParoleMediaChooser *chooser, GtkWidget *file_chooser)
{
GSList *media_files = NULL;
GSList *files;
@@ -119,96 +119,96 @@ parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
guint i;
guint len;
- files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (file_chooser));
- filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (file_chooser));
+ files = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(file_chooser));
+ filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(file_chooser));
if ( G_UNLIKELY (files == NULL) )
return;
- g_object_get (G_OBJECT (chooser->conf),
+ g_object_get(G_OBJECT(chooser->conf),
"scan-recursive", &scan_recursive,
NULL);
- len = g_slist_length (files);
+ len = g_slist_length(files);
for ( i = 0; i < len; i++)
{
- file = g_slist_nth_data (files, i);
+ file = g_slist_nth_data(files, i);
if (g_str_has_suffix(file, ".iso"))
{
// FIXME: Is there some way to add the ISO to the playlist?
// For now we will play the ISO if it is the first file found, otherwise ignore.
if (g_slist_length(media_files) != 0)
continue;
- g_signal_emit (G_OBJECT (chooser), signals[ISO_OPENED], 0, file);
+ g_signal_emit(G_OBJECT(chooser), signals[ISO_OPENED], 0, file);
- g_slist_free (media_files);
+ g_slist_free(media_files);
- g_slist_foreach (files, (GFunc) g_free, NULL);
- g_slist_free (files);
+ g_slist_foreach(files, (GFunc)g_free, NULL);
+ g_slist_free(files);
return;
}
- parole_get_media_files (filter, file, scan_recursive, &media_files);
+ parole_get_media_files(filter, file, scan_recursive, &media_files);
}
- g_signal_emit (G_OBJECT (chooser), signals[MEDIA_FILES_OPENED], 0, media_files);
- g_slist_free (media_files);
+ g_signal_emit(G_OBJECT(chooser), signals[MEDIA_FILES_OPENED], 0, media_files);
+ g_slist_free(media_files);
- g_slist_foreach (files, (GFunc) g_free, NULL);
- g_slist_free (files);
+ g_slist_foreach(files, (GFunc)g_free, NULL);
+ g_slist_free(files);
}
static gboolean
-parole_media_chooser_add_idle (gpointer data)
+parole_media_chooser_add_idle(gpointer data)
{
ParoleMediaChooser *chooser;
GtkWidget *file_chooser;
- chooser = PAROLE_MEDIA_CHOOSER (data);
+ chooser = PAROLE_MEDIA_CHOOSER(data);
- file_chooser = GTK_WIDGET (g_object_get_data (G_OBJECT (chooser), "file-chooser"));
+ file_chooser = GTK_WIDGET(g_object_get_data(G_OBJECT(chooser), "file-chooser"));
- parole_media_chooser_add (chooser, file_chooser);
+ parole_media_chooser_add(chooser, file_chooser);
- gtk_widget_destroy (chooser->window);
+ gtk_widget_destroy(chooser->window);
return FALSE;
}
static void
-parole_media_chooser_open (ParoleMediaChooser *chooser)
+parole_media_chooser_open(ParoleMediaChooser *chooser)
{
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET(chooser->window)));
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(chooser->window)));
gtk_widget_show(chooser->spinner);
- g_idle_add ((GSourceFunc) parole_media_chooser_add_idle, chooser);
+ g_idle_add((GSourceFunc) parole_media_chooser_add_idle, chooser);
}
-void parole_media_chooser_add_clicked (GtkWidget *widget, ParoleMediaChooser *chooser)
+void parole_media_chooser_add_clicked(GtkWidget *widget, ParoleMediaChooser *chooser)
{
- parole_media_chooser_open (chooser);
+ parole_media_chooser_open(chooser);
}
/* Destroy the widget when close is clicked */
-void parole_media_chooser_close_clicked (GtkWidget *widget, ParoleMediaChooser *chooser)
+void parole_media_chooser_close_clicked(GtkWidget *widget, ParoleMediaChooser *chooser)
{
- gtk_widget_destroy (chooser->window);
+ gtk_widget_destroy(chooser->window);
}
-void parole_media_chooser_destroy_cb (GtkWidget *widget, ParoleMediaChooser *chooser)
+void parole_media_chooser_destroy_cb(GtkWidget *widget, ParoleMediaChooser *chooser)
{
- g_object_unref (chooser);
+ g_object_unref(chooser);
}
-void media_chooser_file_activate_cb (GtkFileChooser *filechooser, ParoleMediaChooser *chooser)
+void media_chooser_file_activate_cb(GtkFileChooser *filechooser, ParoleMediaChooser *chooser)
{
- parole_media_chooser_open (chooser);
+ parole_media_chooser_open(chooser);
}
static void
-parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
+parole_media_chooser_open_internal(ParoleMediaChooser *media_chooser)
{
GtkWidget *file_chooser;
GtkBuilder *builder;
@@ -219,18 +219,18 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
gboolean play;
const gchar *folder;
- builder = parole_builder_new_from_string (mediachooser_ui, mediachooser_ui_length);
+ builder = parole_builder_new_from_string(mediachooser_ui, mediachooser_ui_length);
- media_chooser->window = GTK_WIDGET (gtk_builder_get_object (builder, "chooser"));
- media_chooser->spinner = GTK_WIDGET (gtk_builder_get_object (builder, "spinner"));
+ media_chooser->window = GTK_WIDGET(gtk_builder_get_object(builder, "chooser"));
+ media_chooser->spinner = GTK_WIDGET(gtk_builder_get_object(builder, "spinner"));
gtk_widget_hide(media_chooser->spinner);
- file_chooser = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserwidget"));
+ file_chooser = GTK_WIDGET(gtk_builder_get_object(builder, "filechooserwidget"));
/* Set filters for the filechooser */
filter = parole_get_supported_files_filter();
- gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), "application/x-cd-image");
+ gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "application/x-cd-image");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), filter);
audio_filter = parole_get_supported_audio_filter();
@@ -244,71 +244,71 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
all_files = gtk_file_filter_new();
gtk_file_filter_set_name(all_files, _("All files"));
- gtk_file_filter_add_pattern (all_files, "*");
+ gtk_file_filter_add_pattern(all_files, "*");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), all_files);
/* Set the folder that is shown */
- g_object_get (G_OBJECT (media_chooser->conf),
+ g_object_get(G_OBJECT(media_chooser->conf),
"media-chooser-folder", &folder,
NULL);
if ( folder )
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_chooser), folder);
+ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), folder);
- gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (file_chooser), TRUE);
+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(file_chooser), TRUE);
/* Get playlist-properties to load files accordingly */
- g_object_get (G_OBJECT (media_chooser->conf),
+ g_object_get(G_OBJECT(media_chooser->conf),
"scan-recursive", &scan_recursive,
"replace-playlist", &replace_playlist,
"play-opened-files", &play,
NULL);
- recursive = GTK_WIDGET (gtk_builder_get_object (builder, "recursive"));
+ recursive = GTK_WIDGET(gtk_builder_get_object(builder, "recursive"));
- g_object_set_data (G_OBJECT (media_chooser), "file-chooser", file_chooser);
- g_object_set_data (G_OBJECT (media_chooser), "recursive", recursive);
+ g_object_set_data(G_OBJECT(media_chooser), "file-chooser", file_chooser);
+ g_object_set_data(G_OBJECT(media_chooser), "recursive", recursive);
- gtk_builder_connect_signals (builder, media_chooser);
+ gtk_builder_connect_signals(builder, media_chooser);
- g_object_unref (builder);
+ g_object_unref(builder);
}
static void
-parole_media_chooser_finalize (GObject *object)
+parole_media_chooser_finalize(GObject *object)
{
ParoleMediaChooser *chooser;
- chooser = PAROLE_MEDIA_CHOOSER (object);
+ chooser = PAROLE_MEDIA_CHOOSER(object);
- g_object_unref (chooser->conf);
+ g_object_unref(chooser->conf);
if ( chooser->window )
- gtk_widget_destroy (chooser->window);
+ gtk_widget_destroy(chooser->window);
- G_OBJECT_CLASS (parole_media_chooser_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_media_chooser_parent_class)->finalize(object);
}
static void
-parole_media_chooser_class_init (ParoleMediaChooserClass *klass)
+parole_media_chooser_class_init(ParoleMediaChooserClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
signals[MEDIA_FILES_OPENED] =
- g_signal_new ("media-files-opened",
+ g_signal_new("media-files-opened",
PAROLE_TYPE_MEDIA_CHOOSER,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleMediaChooserClass, media_files_opened),
+ G_STRUCT_OFFSET(ParoleMediaChooserClass, media_files_opened),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[ISO_OPENED] =
- g_signal_new ("iso-opened",
+ g_signal_new("iso-opened",
PAROLE_TYPE_MEDIA_CHOOSER,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleMediaChooserClass, iso_opened),
+ G_STRUCT_OFFSET(ParoleMediaChooserClass, iso_opened),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
@@ -318,27 +318,27 @@ parole_media_chooser_class_init (ParoleMediaChooserClass *klass)
}
static void
-parole_media_chooser_init (ParoleMediaChooser *chooser)
+parole_media_chooser_init(ParoleMediaChooser *chooser)
{
- chooser->conf = parole_conf_new ();
+ chooser->conf = parole_conf_new();
}
-ParoleMediaChooser *parole_media_chooser_open_local (GtkWidget *parent)
+ParoleMediaChooser *parole_media_chooser_open_local(GtkWidget *parent)
{
ParoleMediaChooser *chooser;
- chooser = g_object_new (PAROLE_TYPE_MEDIA_CHOOSER, NULL);
+ chooser = g_object_new(PAROLE_TYPE_MEDIA_CHOOSER, NULL);
- parole_media_chooser_open_internal (chooser);
+ parole_media_chooser_open_internal(chooser);
- gtk_window_set_modal (GTK_WINDOW (chooser->window), TRUE);
+ gtk_window_set_modal(GTK_WINDOW(chooser->window), TRUE);
if ( parent )
- gtk_window_set_transient_for (GTK_WINDOW (chooser->window), GTK_WINDOW (parent));
+ gtk_window_set_transient_for(GTK_WINDOW(chooser->window), GTK_WINDOW(parent));
- gtk_window_set_position (GTK_WINDOW (chooser->window), GTK_WIN_POS_CENTER_ON_PARENT);
+ gtk_window_set_position(GTK_WINDOW(chooser->window), GTK_WIN_POS_CENTER_ON_PARENT);
- gtk_widget_show_all (chooser->window);
+ gtk_widget_show_all(chooser->window);
return chooser;
}
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 62078bf..dd354ab 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -88,46 +88,46 @@ static GtkTargetEntry target_entry[] =
ParoleMediaList *media_list = NULL;
-static void parole_media_list_dbus_class_init (ParoleMediaListClass *klass);
-static void parole_media_list_dbus_init (ParoleMediaList *list);
+static void parole_media_list_dbus_class_init(ParoleMediaListClass *klass);
+static void parole_media_list_dbus_init(ParoleMediaList *list);
static GtkTreeRowReference *
-parole_media_list_get_row_reference_from_iter (ParoleMediaList *list,
+parole_media_list_get_row_reference_from_iter(ParoleMediaList *list,
GtkTreeIter *iter,
gboolean select_path);
-static void parole_media_list_select_path (ParoleMediaList *list,
+static void parole_media_list_select_path(ParoleMediaList *list,
gboolean disc,
GtkTreePath *path);
/*
* Callbacks for GtkBuilder
*/
-void parole_media_list_add_clicked_cb (GtkButton *button,
+void parole_media_list_add_clicked_cb(GtkButton *button,
ParoleMediaList *list);
-void parole_media_list_remove_clicked_cb (GtkButton *button,
+void parole_media_list_remove_clicked_cb(GtkButton *button,
ParoleMediaList *list);
-void parole_media_list_clear_clicked_cb (GtkButton *button,
+void parole_media_list_clear_clicked_cb(GtkButton *button,
ParoleMediaList *list);
-void parole_media_list_move_up_clicked_cb (GtkButton *button,
+void parole_media_list_move_up_clicked_cb(GtkButton *button,
ParoleMediaList *list);
-void parole_media_list_move_down_clicked_cb (GtkButton *button,
+void parole_media_list_move_down_clicked_cb(GtkButton *button,
ParoleMediaList *list);
-void parole_media_list_row_activated_cb (GtkTreeView *view,
+void parole_media_list_row_activated_cb(GtkTreeView *view,
GtkTreePath *path,
GtkTreeViewColumn *col,
ParoleMediaList *list);
-gboolean parole_media_list_button_release_event (GtkWidget *widget,
+gboolean parole_media_list_button_release_event(GtkWidget *widget,
GdkEventButton *ev,
ParoleMediaList *list);
-void parole_media_list_drag_data_received_cb (GtkWidget *widget,
+void parole_media_list_drag_data_received_cb(GtkWidget *widget,
GdkDragContext *drag_context,
gint x,
gint y,
@@ -136,18 +136,18 @@ void parole_media_list_drag_data_received_cb (GtkWidget *widget,
guint drag_time,
ParoleMediaList *list);
-gboolean parole_media_list_key_press (GtkWidget *widget,
+gboolean parole_media_list_key_press(GtkWidget *widget,
GdkEventKey *ev,
ParoleMediaList *list);
void
-parole_media_list_format_cursor_changed_cb (GtkTreeView *view,
+parole_media_list_format_cursor_changed_cb(GtkTreeView *view,
ParolePlaylistSave *data);
-void parole_media_list_save_playlist_cb (GtkButton *button,
+void parole_media_list_save_playlist_cb(GtkButton *button,
ParolePlaylistSave *data);
-gboolean parole_media_list_query_tooltip (GtkWidget *widget,
+gboolean parole_media_list_query_tooltip(GtkWidget *widget,
gint x,
gint y,
gboolean keyboard_mode,
@@ -159,7 +159,7 @@ gboolean parole_media_list_query_tooltip (GtkWidget *widget,
*/
#define PAROLE_MEDIA_LIST_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_MEDIA_LIST, ParoleMediaListPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_MEDIA_LIST, ParoleMediaListPrivate))
struct ParoleMediaListPrivate
{
@@ -201,28 +201,28 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (ParoleMediaList, parole_media_list, GTK_TYPE_BOX)
+G_DEFINE_TYPE(ParoleMediaList, parole_media_list, GTK_TYPE_BOX)
static void
-parole_media_list_set_widget_sensitive (ParoleMediaList *list, gboolean sensitive)
+parole_media_list_set_widget_sensitive(ParoleMediaList *list, gboolean sensitive)
{
- gtk_widget_set_sensitive (GTK_WIDGET (list->priv->remove_button), sensitive);
- gtk_widget_set_sensitive (GTK_WIDGET (list->priv->clear_button), sensitive);
+ gtk_widget_set_sensitive(GTK_WIDGET(list->priv->remove_button), sensitive);
+ gtk_widget_set_sensitive(GTK_WIDGET(list->priv->clear_button), sensitive);
}
static void
-parole_media_list_set_playlist_count (ParoleMediaList *list, gint n_items)
+parole_media_list_set_playlist_count(ParoleMediaList *list, gint n_items)
{
/* Toggle sensitivity based on playlist count */
- parole_media_list_set_widget_sensitive (list, n_items != 0);
- gtk_widget_set_sensitive (list->priv->remove_button, n_items != 0);
- gtk_widget_set_sensitive (list->priv->clear_button, n_items != 0);
+ parole_media_list_set_widget_sensitive(list, n_items != 0);
+ gtk_widget_set_sensitive(list->priv->remove_button, n_items != 0);
+ gtk_widget_set_sensitive(list->priv->clear_button, n_items != 0);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
- gtk_tree_view_column_set_title (list->priv->col,
+ gtk_tree_view_column_set_title(list->priv->col,
g_strdup_printf(ngettext("Playlist (%i item)", "Playlist (%i items)", n_items), n_items));
} else {
- gtk_tree_view_column_set_title (list->priv->disc_col,
+ gtk_tree_view_column_set_title(list->priv->disc_col,
g_strdup_printf(ngettext("Playlist (%i chapter)", "Playlist (%i chapters)", n_items), n_items));
}
@@ -230,11 +230,11 @@ parole_media_list_set_playlist_count (ParoleMediaList *list, gint n_items)
* Will emit the signal media_cursor_changed with FALSE because there is no any
* row remaining, so the player can disable click on the play button.
*/
- g_signal_emit (G_OBJECT (list), signals[MEDIA_CURSOR_CHANGED], 0, n_items != 0);
+ g_signal_emit(G_OBJECT(list), signals[MEDIA_CURSOR_CHANGED], 0, n_items != 0);
}
gint
-parole_media_list_get_playlist_count (ParoleMediaList *list)
+parole_media_list_get_playlist_count(ParoleMediaList *list)
{
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
return gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->store), NULL);
@@ -256,7 +256,7 @@ parole_media_list_get_playlist_count (ParoleMediaList *list)
* start playing the added file.
**/
static void
-parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, gboolean emit, gboolean select_row)
+parole_media_list_add(ParoleMediaList *list, ParoleFile *file, gboolean disc, gboolean emit, gboolean select_row)
{
GtkListStore *list_store;
GtkTreePath *path;
@@ -268,15 +268,15 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
gchar *filename;
ParoleFile *row_file;
gboolean remove_duplicates;
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"remove-duplicated", &remove_duplicates,
NULL);
/* Set the list_store variable based on with store we're viewing. */
if (disc)
- list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->disc_view)));
+ list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list->priv->disc_view)));
else
- list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->view)));
+ list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list->priv->view)));
/* Remove duplicates functionality. If the file being added is already in the
* playlist, remove it from its current position in the playlist before
@@ -291,7 +291,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL, &row_file, -1);
if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
{
- gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+ gtk_list_store_remove(GTK_LIST_STORE(list_store), &iter);
}
/* Check subsequent rows */
@@ -299,7 +299,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL, &row_file, -1);
if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
{
- gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+ gtk_list_store_remove(GTK_LIST_STORE(list_store), &iter);
}
}
@@ -308,35 +308,35 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
}
/* Add the file to the playlist */
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store,
+ gtk_list_store_append(list_store, &iter);
+ gtk_list_store_set(list_store,
&iter,
- NAME_COL, parole_file_get_display_name (file),
+ NAME_COL, parole_file_get_display_name(file),
DATA_COL, file,
- LENGTH_COL, parole_taglibc_get_media_length (file),
+ LENGTH_COL, parole_taglibc_get_media_length(file),
STATE_COL, PAROLE_MEDIA_STATE_NONE,
-1);
if ( emit || select_row )
{
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
- row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
+ path = gtk_tree_model_get_path(GTK_TREE_MODEL(list_store), &iter);
+ row = gtk_tree_row_reference_new(GTK_TREE_MODEL(list_store), path);
if ( select_row )
- parole_media_list_select_path (list, disc, path);
- gtk_tree_path_free (path);
+ parole_media_list_select_path(list, disc, path);
+ gtk_tree_path_free(path);
if ( emit )
- g_signal_emit (G_OBJECT (list), signals[MEDIA_ACTIVATED], 0, row);
- gtk_tree_row_reference_free (row);
+ g_signal_emit(G_OBJECT(list), signals[MEDIA_ACTIVATED], 0, row);
+ gtk_tree_row_reference_free(row);
}
/*
* Unref it as the list store will have
* a reference anyway.
*/
- g_object_unref (file);
+ g_object_unref(file);
/* Update the playlist count. */
- nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list_store), NULL);
+ nch = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list_store), NULL);
parole_media_list_set_playlist_count(list, nch);
}
@@ -349,40 +349,40 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
*
**/
static void
-parole_media_list_files_open (ParoleMediaList *list, GSList *files, gboolean disc, gboolean emit)
+parole_media_list_files_open(ParoleMediaList *list, GSList *files, gboolean disc, gboolean emit)
{
ParoleFile *file;
gboolean replace;
guint len;
guint i;
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"replace-playlist", &replace,
NULL);
- len = g_slist_length (files);
- TRACE ("Adding %i files", len);
+ len = g_slist_length(files);
+ TRACE("Adding %i files", len);
if ( len > 1 && !disc )
- g_signal_emit (G_OBJECT (list), signals[SHOW_PLAYLIST], 0, TRUE);
+ g_signal_emit(G_OBJECT(list), signals[SHOW_PLAYLIST], 0, TRUE);
if ( len != 0 )
{
if ( replace )
- parole_media_list_clear_list (list);
- file = g_slist_nth_data (files, 0);
- parole_media_list_add (list, file, disc, emit, TRUE);
+ parole_media_list_clear_list(list);
+ file = g_slist_nth_data(files, 0);
+ parole_media_list_add(list, file, disc, emit, TRUE);
}
for ( i = 1; i < len; i++)
{
- file = g_slist_nth_data (files, i);
- parole_media_list_add (list, file, disc, FALSE, FALSE);
+ file = g_slist_nth_data(files, i);
+ parole_media_list_add(list, file, disc, FALSE, FALSE);
}
}
void
-parole_media_list_add_cdda_tracks (ParoleMediaList *list, gint n_tracks)
+parole_media_list_add_cdda_tracks(ParoleMediaList *list, gint n_tracks)
{
GSList *files = NULL;
ParoleFile *file;
@@ -398,7 +398,7 @@ parole_media_list_add_cdda_tracks (ParoleMediaList *list, gint n_tracks)
}
void
-parole_media_list_add_dvd_chapters (ParoleMediaList *list, gint n_chapters)
+parole_media_list_add_dvd_chapters(ParoleMediaList *list, gint n_chapters)
{
GSList *files = NULL;
ParoleFile *file;
@@ -416,73 +416,73 @@ parole_media_list_add_dvd_chapters (ParoleMediaList *list, gint n_chapters)
/* Callback to determine whether opened files should start playing immediately */
static void
-parole_media_list_files_opened_cb (ParoleMediaChooser *chooser,
+parole_media_list_files_opened_cb(ParoleMediaChooser *chooser,
GSList *files,
ParoleMediaList *list)
{
gboolean play;
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"play-opened-files", &play,
NULL);
- parole_media_list_files_open (list, files, FALSE, play);
+ parole_media_list_files_open(list, files, FALSE, play);
}
void
-parole_media_list_open_uri (ParoleMediaList *list, const gchar *uri)
+parole_media_list_open_uri(ParoleMediaList *list, const gchar *uri)
{
ParoleFile *file;
- if ( parole_is_uri_disc (uri) ) {
- g_signal_emit (G_OBJECT (list), signals[URI_OPENED], 0, uri);
+ if ( parole_is_uri_disc(uri) ) {
+ g_signal_emit(G_OBJECT(list), signals[URI_OPENED], 0, uri);
} else {
- file = parole_file_new (uri);
- parole_media_list_add (list, file, FALSE, TRUE, TRUE);
+ file = parole_file_new(uri);
+ parole_media_list_add(list, file, FALSE, TRUE, TRUE);
}
}
static void
-parole_media_list_location_opened_cb (ParoleOpenLocation *obj, const gchar *location, ParoleMediaList *list)
+parole_media_list_location_opened_cb(ParoleOpenLocation *obj, const gchar *location, ParoleMediaList *list)
{
parole_media_list_open_uri(list, location);
}
static void
-parole_media_list_iso_opened_cb (ParoleMediaChooser *chooser,
+parole_media_list_iso_opened_cb(ParoleMediaChooser *chooser,
gchar *filename,
ParoleMediaList *list)
{
gchar *uri;
- uri = g_strdup_printf ("dvd://%s", filename);
- g_signal_emit (G_OBJECT (list), signals[ISO_OPENED], 0, uri);
+ uri = g_strdup_printf("dvd://%s", filename);
+ g_signal_emit(G_OBJECT(list), signals[ISO_OPENED], 0, uri);
}
static void
-parole_media_list_open_internal (ParoleMediaList *list)
+parole_media_list_open_internal(ParoleMediaList *list)
{
ParoleMediaChooser *chooser;
- TRACE ("start");
+ TRACE("start");
- chooser = parole_media_chooser_open_local (gtk_widget_get_toplevel (GTK_WIDGET (list)));
+ chooser = parole_media_chooser_open_local(gtk_widget_get_toplevel(GTK_WIDGET(list)));
- g_signal_connect (G_OBJECT (chooser), "media_files_opened",
- G_CALLBACK (parole_media_list_files_opened_cb), list);
+ g_signal_connect(G_OBJECT(chooser), "media_files_opened",
+ G_CALLBACK(parole_media_list_files_opened_cb), list);
- g_signal_connect (G_OBJECT (chooser), "iso_opened",
- G_CALLBACK (parole_media_list_iso_opened_cb), list);
+ g_signal_connect(G_OBJECT(chooser), "iso_opened",
+ G_CALLBACK(parole_media_list_iso_opened_cb), list);
}
static void
-parole_media_list_open_location_internal (ParoleMediaList *list)
+parole_media_list_open_location_internal(ParoleMediaList *list)
{
ParoleOpenLocation *location;
- location = parole_open_location (gtk_widget_get_toplevel (GTK_WIDGET (list)));
+ location = parole_open_location(gtk_widget_get_toplevel(GTK_WIDGET(list)));
- g_signal_connect (G_OBJECT (location), "location-opened",
- G_CALLBACK (parole_media_list_location_opened_cb), list);
+ g_signal_connect(G_OBJECT(location), "location-opened",
+ G_CALLBACK(parole_media_list_location_opened_cb), list);
}
/**
@@ -496,7 +496,7 @@ parole_media_list_open_location_internal (ParoleMediaList *list)
*
**/
static GSList *
-parole_media_list_get_files (ParoleMediaList *list)
+parole_media_list_get_files(ParoleMediaList *list)
{
ParoleFile *file;
GtkTreeIter iter;
@@ -505,20 +505,20 @@ parole_media_list_get_files (ParoleMediaList *list)
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter);
valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list->priv->store), &iter))
+ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(list->priv->store), &iter))
{
- gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
+ gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter,
DATA_COL, &file,
-1);
- files_list = g_slist_append (files_list, file);
+ files_list = g_slist_append(files_list, file);
}
return files_list;
}
/* Callback when an item is dragged on the playlist-widget */
-void parole_media_list_drag_data_received_cb (GtkWidget *widget,
+void parole_media_list_drag_data_received_cb(GtkWidget *widget,
GdkDragContext *drag_context,
gint x,
gint y,
@@ -533,35 +533,35 @@ void parole_media_list_drag_data_received_cb (GtkWidget *widget,
guint added = 0;
gboolean play;
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (list)));
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(list)));
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"play-opened-files", &play,
NULL);
- uri_list = g_uri_list_extract_uris ((const gchar *)gtk_selection_data_get_data(data));
+ uri_list = g_uri_list_extract_uris((const gchar *)gtk_selection_data_get_data(data));
for ( i = 0; uri_list[i] != NULL; i++)
{
- path = g_filename_from_uri (uri_list[i], NULL, NULL);
- added += parole_media_list_add_by_path (list, path, i == 0 ? play : FALSE);
+ path = g_filename_from_uri(uri_list[i], NULL, NULL);
+ added += parole_media_list_add_by_path(list, path, i == 0 ? play : FALSE);
- g_free (path);
+ g_free(path);
}
- g_strfreev (uri_list);
+ g_strfreev(uri_list);
- parole_window_normal_cursor (gtk_widget_get_window(GTK_WIDGET (list)));
- gtk_drag_finish (drag_context, added == i ? TRUE : FALSE, FALSE, drag_time);
+ parole_window_normal_cursor(gtk_widget_get_window(GTK_WIDGET(list)));
+ gtk_drag_finish(drag_context, added == i ? TRUE : FALSE, FALSE, drag_time);
}
-gboolean parole_media_list_key_press (GtkWidget *widget, GdkEventKey *ev, ParoleMediaList *list)
+gboolean parole_media_list_key_press(GtkWidget *widget, GdkEventKey *ev, ParoleMediaList *list)
{
GtkWidget *vbox_player;
switch ( ev->keyval )
{
case GDK_KEY_Delete:
- parole_media_list_remove_clicked_cb (NULL, list);
+ parole_media_list_remove_clicked_cb(NULL, list);
return TRUE;
break;
case GDK_KEY_Right:
@@ -582,19 +582,19 @@ gboolean parole_media_list_key_press (GtkWidget *widget, GdkEventKey *ev, Parole
/* Callback for the add button */
void
-parole_media_list_add_clicked_cb (GtkButton *button, ParoleMediaList *list)
+parole_media_list_add_clicked_cb(GtkButton *button, ParoleMediaList *list)
{
- parole_media_list_open_internal (list);
+ parole_media_list_open_internal(list);
}
/* Callback for the clear button */
void
-parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list)
+parole_media_list_clear_clicked_cb(GtkButton *button, ParoleMediaList *list)
{
gchar *playlist_filename;
GFile *playlist_file;
- parole_media_list_clear_list (list);
- playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA,
+ parole_media_list_clear_list(list);
+ playlist_filename = xfce_resource_save_location(XFCE_RESOURCE_DATA,
PAROLE_AUTO_SAVED_PLAYLIST,
FALSE);
playlist_file = g_file_new_for_path(playlist_filename);
@@ -613,28 +613,28 @@ parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list)
*
**/
static GtkTreeRowReference *
-parole_media_list_get_first_selected_row (ParoleMediaList *list)
+parole_media_list_get_first_selected_row(ParoleMediaList *list)
{
GtkTreeModel *model;
GtkTreeRowReference *row = NULL;
GtkTreeIter iter;
GList *path_list = NULL;
- path_list = gtk_tree_selection_get_selected_rows (list->priv->sel, &model);
+ path_list = gtk_tree_selection_get_selected_rows(list->priv->sel, &model);
if ( g_list_length (path_list) > 0 )
{
GtkTreePath *path;
- path = g_list_nth_data (path_list, 0);
+ path = g_list_nth_data(path_list, 0);
if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ))
{
- row = parole_media_list_get_row_reference_from_iter (list, &iter, FALSE);
+ row = parole_media_list_get_row_reference_from_iter(list, &iter, FALSE);
}
}
- g_list_foreach (path_list, (GFunc)gtk_tree_path_free, NULL);
- g_list_free (path_list);
+ g_list_foreach(path_list, (GFunc)gtk_tree_path_free, NULL);
+ g_list_free(path_list);
return row;
}
@@ -648,7 +648,7 @@ parole_media_list_get_first_selected_row (ParoleMediaList *list)
* Returns: a #ParoleFile
**/
static ParoleFile *
-parole_media_list_get_first_selected_file (ParoleMediaList *list)
+parole_media_list_get_first_selected_file(ParoleMediaList *list)
{
ParoleFile *file = NULL;
GtkTreeRowReference *row;
@@ -658,16 +658,16 @@ parole_media_list_get_first_selected_file (ParoleMediaList *list)
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store),
&iter,
- gtk_tree_row_reference_get_path (row)) )
+ gtk_tree_row_reference_get_path(row)) )
{
- gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter, DATA_COL, &file, -1);
+ gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter, DATA_COL, &file, -1);
}
return file;
}
static void
-parole_media_list_save_playlist_response_cb (GtkDialog *dialog,
+parole_media_list_save_playlist_response_cb(GtkDialog *dialog,
gint response_id,
ParolePlaylistSave *data)
{
@@ -681,52 +681,52 @@ parole_media_list_save_playlist_response_cb (GtkDialog *dialog,
GtkTreeModel *model;
GtkTreeIter iter;
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->chooser));
- dirname = g_path_get_dirname (filename);
+ filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data->chooser));
+ dirname = g_path_get_dirname(filename);
if ( gtk_tree_selection_get_selected (data->sel, &model, &iter ) )
{
- gtk_tree_model_get (model, &iter, 2, &format, -1);
+ gtk_tree_model_get(model, &iter, 2, &format, -1);
}
if ( g_access (dirname, W_OK) == -1 )
{
gchar *msg;
- msg = g_strdup_printf ("%s %s", dirname, _("Permission denied"));
- parole_dialog_error (GTK_WINDOW (gtk_widget_get_toplevel (data->list->priv->view)),
+ msg = g_strdup_printf("%s %s", dirname, _("Permission denied"));
+ parole_dialog_error(GTK_WINDOW(gtk_widget_get_toplevel(data->list->priv->view)),
_("Error saving playlist file"),
msg);
- g_free (msg);
+ g_free(msg);
goto out;
}
if ( format == PAROLE_PL_FORMAT_UNKNOWN )
{
- format = parole_pl_parser_guess_format_from_extension (filename);
+ format = parole_pl_parser_guess_format_from_extension(filename);
if ( format == PAROLE_PL_FORMAT_UNKNOWN )
{
- parole_dialog_info (GTK_WINDOW (gtk_widget_get_toplevel (data->list->priv->view)),
+ parole_dialog_info(GTK_WINDOW(gtk_widget_get_toplevel(data->list->priv->view)),
_("Unknown playlist format"),
_("Please choose a supported playlist format"));
goto out;
}
}
- list = parole_media_list_get_files (data->list);
+ list = parole_media_list_get_files(data->list);
- parole_pl_parser_save_from_files (list, filename, format);
- g_slist_free (list);
+ parole_pl_parser_save_from_files(list, filename, format);
+ g_slist_free(list);
}
data->closing = TRUE;
gtk_widget_destroy(GTK_WIDGET(dialog));
g_free(data);
out:
- g_free (filename);
- g_free (dirname);
+ g_free(filename);
+ g_free(dirname);
}
/* Query to get the data to populate the tooltip */
-gboolean parole_media_list_query_tooltip (GtkWidget *widget,
+gboolean parole_media_list_query_tooltip(GtkWidget *widget,
gint x,
gint y,
gboolean keyboard_mode,
@@ -752,7 +752,7 @@ gboolean parole_media_list_query_tooltip (GtkWidget *widget,
gchar *name;
gchar *len;
- gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
+ gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter,
DATA_COL, &file,
NAME_COL, &name,
LENGTH_COL, &len,
@@ -760,19 +760,19 @@ gboolean parole_media_list_query_tooltip (GtkWidget *widget,
if (!len)
{
- len = g_strdup (_("Unknown"));
+ len = g_strdup(_("Unknown"));
}
- tip = g_strdup_printf ("File: %s\nName: %s\nLength: %s",
- parole_file_get_file_name (file),
+ tip = g_strdup_printf("File: %s\nName: %s\nLength: %s",
+ parole_file_get_file_name(file),
name,
len);
- gtk_tooltip_set_text (tooltip, tip);
- g_free (tip);
- g_free (name);
- g_free (len);
- gtk_tree_path_free (path);
+ gtk_tooltip_set_text(tooltip, tip);
+ g_free(tip);
+ g_free(name);
+ g_free(len);
+ gtk_tree_path_free(path);
return TRUE;
}
@@ -782,7 +782,7 @@ gboolean parole_media_list_query_tooltip (GtkWidget *widget,
return FALSE;
}
-void parole_media_list_format_cursor_changed_cb (GtkTreeView *view, ParolePlaylistSave *data)
+void parole_media_list_format_cursor_changed_cb(GtkTreeView *view, ParolePlaylistSave *data)
{
GtkTreeIter iter;
GtkTreeModel *model;
@@ -795,32 +795,32 @@ void parole_media_list_format_cursor_changed_cb (GtkTreeView *view, ParolePlayli
return;
// FIXME: replaces entered filename with Playlist.
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->chooser));
+ filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data->chooser));
if (filename)
- fbasename = g_path_get_basename (filename);
+ fbasename = g_path_get_basename(filename);
else
- fbasename = g_strconcat (_("Playlist"), ".m3u", NULL);
+ fbasename = g_strconcat(_("Playlist"), ".m3u", NULL);
- g_free (filename);
+ g_free(filename);
if ( gtk_tree_selection_get_selected (data->sel, &model, &iter ) )
{
- gtk_tree_model_get (model, &iter, 2, &format, -1);
+ gtk_tree_model_get(model, &iter, 2, &format, -1);
if ( format != PAROLE_PL_FORMAT_UNKNOWN )
{
gchar *name, *new_name;
- name = parole_get_name_without_extension (fbasename);
- new_name = g_strdup_printf ("%s%s", name, playlist_format_map[format].ext);
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (data->chooser), new_name);
- g_free (new_name);
- g_free (name);
+ name = parole_get_name_without_extension(fbasename);
+ new_name = g_strdup_printf("%s%s", name, playlist_format_map[format].ext);
+ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(data->chooser), new_name);
+ g_free(new_name);
+ g_free(name);
}
}
- g_free (fbasename);
+ g_free(fbasename);
}
/* Callback to save the current playlist */
-void parole_media_list_save_cb (GtkWidget *widget, ParoleMediaList *list)
+void parole_media_list_save_cb(GtkWidget *widget, ParoleMediaList *list)
{
ParolePlaylistSave *data;
GtkWidget *chooser;
@@ -830,65 +830,65 @@ void parole_media_list_save_cb (GtkWidget *widget, ParoleMediaList *list)
gchar *filename;
GtkTreeIter iter;
- data = g_new0 (ParolePlaylistSave, 1);
+ data = g_new0(ParolePlaylistSave, 1);
- builder = parole_builder_new_from_string (save_playlist_ui, save_playlist_ui_length);
- chooser = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserdialog"));
- store = GTK_LIST_STORE (gtk_builder_get_object (builder, "liststore"));
+ builder = parole_builder_new_from_string(save_playlist_ui, save_playlist_ui_length);
+ chooser = GTK_WIDGET(gtk_builder_get_object(builder, "filechooserdialog"));
+ store = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststore"));
- gtk_window_set_transient_for (GTK_WINDOW (chooser),
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (list))));
+ gtk_window_set_transient_for(GTK_WINDOW(chooser),
+ GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(list))));
- gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (chooser), TRUE);
+ gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser), TRUE);
- filename = g_strconcat (_("Playlist"), ".m3u", NULL);
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser), filename);
- g_free (filename);
+ filename = g_strconcat(_("Playlist"), ".m3u", NULL);
+ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), filename);
+ g_free(filename);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store,
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store,
&iter,
0, _("M3U Playlists"),
1, "m3u",
2, PAROLE_PL_FORMAT_M3U,
-1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store,
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store,
&iter,
0, _("PLS Playlists"),
1, "pls",
2, PAROLE_PL_FORMAT_PLS,
-1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store,
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store,
&iter,
0, _("Advanced Stream Redirector"),
1, "asx",
2, PAROLE_PL_FORMAT_ASX,
-1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store,
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store,
&iter,
0, _("Shareable Playlist"),
1, "xspf",
2, PAROLE_PL_FORMAT_XSPF,
-1);
- view = GTK_WIDGET (gtk_builder_get_object (builder, "treeview"));
+ view = GTK_WIDGET(gtk_builder_get_object(builder, "treeview"));
g_signal_connect(G_OBJECT(chooser), "response", G_CALLBACK(parole_media_list_save_playlist_response_cb), data);
data->chooser = chooser;
data->closing = FALSE;
- data->sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+ data->sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
data->list = list;
- gtk_builder_connect_signals (builder, data);
- gtk_widget_show_all (chooser);
- g_object_unref (builder);
+ gtk_builder_connect_signals(builder, data);
+ gtk_widget_show_all(chooser);
+ g_object_unref(builder);
}
/**
@@ -900,14 +900,14 @@ void parole_media_list_save_cb (GtkWidget *widget, ParoleMediaList *list)
* Returns: a #GtkTreePath
**/
static GtkTreePath *
-parole_media_list_get_first_path (GtkTreeModel *model)
+parole_media_list_get_first_path(GtkTreeModel *model)
{
GtkTreePath *path = NULL;
GtkTreeIter iter;
if (gtk_tree_model_get_iter_first (model, &iter) )
{
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+ path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), &iter);
}
return path;
@@ -926,23 +926,23 @@ parole_media_list_get_first_path (GtkTreeModel *model)
*
**/
static GList *
-parole_media_list_paths_to_row_list (GList *path_list, GtkTreeModel *model)
+parole_media_list_paths_to_row_list(GList *path_list, GtkTreeModel *model)
{
GList *row_list = NULL;
guint len, i;
- len = g_list_length (path_list);
+ len = g_list_length(path_list);
for ( i = 0; i < len; i++)
{
GtkTreePath *path;
GtkTreeRowReference *row;
- path = g_list_nth_data (path_list, i);
+ path = g_list_nth_data(path_list, i);
- row = gtk_tree_row_reference_new (model, path);
+ row = gtk_tree_row_reference_new(model, path);
- row_list = g_list_append (row_list, row);
+ row_list = g_list_append(row_list, row);
}
return row_list;
@@ -950,7 +950,7 @@ parole_media_list_paths_to_row_list (GList *path_list, GtkTreeModel *model)
/* Callback for the remove-from-playlist button */
void
-parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
+parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list)
{
GtkTreeModel *model;
GList *path_list = NULL;
@@ -961,13 +961,13 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
guint len, i;
/* Get the GtkTreePath GList of all selected rows */
- path_list = gtk_tree_selection_get_selected_rows (list->priv->sel, &model);
+ path_list = gtk_tree_selection_get_selected_rows(list->priv->sel, &model);
/**
* Convert them to row references so when we remove one the others always points
* to the correct node.
**/
- row_list = parole_media_list_paths_to_row_list (path_list, model);
+ row_list = parole_media_list_paths_to_row_list(path_list, model);
/**
* Select first path before the first path
@@ -978,69 +978,69 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
GtkTreePath *path, *prev;
/* Get first item */
- path = g_list_nth_data (path_list, 0);
+ path = g_list_nth_data(path_list, 0);
/* copy it as we don't mess with the list*/
- prev = gtk_tree_path_copy (path);
+ prev = gtk_tree_path_copy(path);
if ( gtk_tree_path_prev (prev) )
{
- parole_media_list_select_path (list, FALSE, prev);
+ parole_media_list_select_path(list, FALSE, prev);
row_selected = TRUE;
}
- gtk_tree_path_free (prev);
+ gtk_tree_path_free(prev);
}
- g_list_foreach (path_list, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (path_list);
+ g_list_foreach(path_list, (GFunc)gtk_tree_path_free, NULL);
+ g_list_free(path_list);
- len = g_list_length (row_list);
+ len = g_list_length(row_list);
for ( i = 0; i < len; i++)
{
GtkTreePath *path;
GtkTreeRowReference *row;
- row = g_list_nth_data (row_list, i);
- path = gtk_tree_row_reference_get_path (row);
+ row = g_list_nth_data(row_list, i);
+ path = gtk_tree_row_reference_get_path(row);
if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ) )
{
- gtk_list_store_remove (GTK_LIST_STORE (model),
+ gtk_list_store_remove(GTK_LIST_STORE(model),
&iter);
}
}
- g_list_foreach (row_list, (GFunc) gtk_tree_row_reference_free, NULL);
- g_list_free (row_list);
+ g_list_foreach(row_list, (GFunc)gtk_tree_row_reference_free, NULL);
+ g_list_free(row_list);
/*
* Returns the number of children that iter has.
* As a special case, if iter is NULL,
* then the number of toplevel nodes is returned. Gtk API doc.
*/
- nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store), NULL);
+ nch = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->store), NULL);
/* No row was selected, then select the first one*/
if (!row_selected && nch != 0)
{
GtkTreePath *path;
- path = parole_media_list_get_first_path (model);
- parole_media_list_select_path (list, FALSE, path);
- gtk_tree_path_free (path);
+ path = parole_media_list_get_first_path(model);
+ parole_media_list_select_path(list, FALSE, path);
+ gtk_tree_path_free(path);
}
parole_media_list_set_playlist_count(list, nch);
}
void
-parole_media_list_move_up_clicked_cb (GtkButton *button, ParoleMediaList *list)
+parole_media_list_move_up_clicked_cb(GtkButton *button, ParoleMediaList *list)
{
GtkTreeModel *model;
GList *path_list = NULL;
GtkTreeIter current, iter;
/* Get the GtkTreePath GList of all selected rows */
- path_list = gtk_tree_selection_get_selected_rows (list->priv->sel, &model);
+ path_list = gtk_tree_selection_get_selected_rows(list->priv->sel, &model);
/**
* Select first path before the first path
@@ -1052,11 +1052,11 @@ parole_media_list_move_up_clicked_cb (GtkButton *button, ParoleMediaList *list)
guint i;
/* Get first item */
- path = g_list_nth_data (path_list, 0);
+ path = g_list_nth_data(path_list, 0);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
{
/* copy it as we don't mess with the list*/
- prev = gtk_tree_path_copy (path);
+ prev = gtk_tree_path_copy(path);
if ( gtk_tree_path_prev (prev) )
{
@@ -1065,29 +1065,29 @@ parole_media_list_move_up_clicked_cb (GtkButton *button, ParoleMediaList *list)
/* Move each item about the previous path */
for (i=0; i < g_list_length(path_list); i++)
{
- path = g_list_nth_data (path_list, i);
+ path = g_list_nth_data(path_list, i);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
gtk_list_store_move_before(GTK_LIST_STORE(model), ¤t, &iter);
}
}
}
- gtk_tree_path_free (prev);
+ gtk_tree_path_free(prev);
}
}
- g_list_foreach (path_list, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (path_list);
+ g_list_foreach(path_list, (GFunc)gtk_tree_path_free, NULL);
+ g_list_free(path_list);
}
void
-parole_media_list_move_down_clicked_cb (GtkButton *button, ParoleMediaList *list)
+parole_media_list_move_down_clicked_cb(GtkButton *button, ParoleMediaList *list)
{
GtkTreeModel *model;
GList *path_list = NULL;
GtkTreeIter current, iter;
/* Get the GtkTreePath GList of all selected rows */
- path_list = gtk_tree_selection_get_selected_rows (list->priv->sel, &model);
+ path_list = gtk_tree_selection_get_selected_rows(list->priv->sel, &model);
/* Reverse the list to repopulate in the right order */
path_list = g_list_reverse(path_list);
@@ -1101,31 +1101,31 @@ parole_media_list_move_down_clicked_cb (GtkButton *button, ParoleMediaList *list
guint i;
/* Get first item */
- path = g_list_nth_data (path_list, 0);
+ path = g_list_nth_data(path_list, 0);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
{
/* copy it as we don't mess with the list*/
- next = gtk_tree_path_copy (path);
+ next = gtk_tree_path_copy(path);
- gtk_tree_path_next (next);
+ gtk_tree_path_next(next);
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, next))
{
/* Move each item about the previous path */
for (i=0; i < g_list_length(path_list); i++)
{
- path = g_list_nth_data (path_list, i);
+ path = g_list_nth_data(path_list, i);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
gtk_list_store_move_after(GTK_LIST_STORE(model), ¤t, &iter);
}
}
- gtk_tree_path_free (next);
+ gtk_tree_path_free(next);
}
}
- g_list_foreach (path_list, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (path_list);
+ g_list_foreach(path_list, (GFunc)gtk_tree_path_free, NULL);
+ g_list_free(path_list);
}
/**
@@ -1134,50 +1134,50 @@ parole_media_list_move_down_clicked_cb (GtkButton *button, ParoleMediaList *list
*
**/
void
-parole_media_list_row_activated_cb (GtkTreeView *view, GtkTreePath *path,
+parole_media_list_row_activated_cb(GtkTreeView *view, GtkTreePath *path,
GtkTreeViewColumn *col, ParoleMediaList *list)
{
GtkTreeRowReference *row;
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
- row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->view)), path);
+ row = gtk_tree_row_reference_new(gtk_tree_view_get_model(GTK_TREE_VIEW(list->priv->view)), path);
else
- row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->disc_view)), path);
+ row = gtk_tree_row_reference_new(gtk_tree_view_get_model(GTK_TREE_VIEW(list->priv->disc_view)), path);
- g_signal_emit (G_OBJECT (list), signals[MEDIA_ACTIVATED], 0, row);
+ g_signal_emit(G_OBJECT(list), signals[MEDIA_ACTIVATED], 0, row);
}
static void
-parole_media_list_selection_changed_cb (GtkTreeSelection *sel, ParoleMediaList *list)
+parole_media_list_selection_changed_cb(GtkTreeSelection *sel, ParoleMediaList *list)
{
- g_signal_emit (G_OBJECT (list), signals[MEDIA_CURSOR_CHANGED], 0,
- gtk_tree_selection_count_selected_rows (sel) > 0);
+ g_signal_emit(G_OBJECT(list), signals[MEDIA_CURSOR_CHANGED], 0,
+ gtk_tree_selection_count_selected_rows(sel) > 0);
}
static void
-parole_media_list_open_folder (GtkWidget *menu)
+parole_media_list_open_folder(GtkWidget *menu)
{
gchar *dirname;
- dirname = (gchar *) g_object_get_data (G_OBJECT (menu), "folder");
+ dirname =(gchar *) g_object_get_data(G_OBJECT(menu), "folder");
if (dirname)
{
gchar *uri;
- uri = g_filename_to_uri (dirname, NULL, NULL);
- TRACE ("Opening %s", dirname);
+ uri = g_filename_to_uri(dirname, NULL, NULL);
+ TRACE("Opening %s", dirname);
#if GTK_CHECK_VERSION(3, 22, 0)
- gtk_show_uri_on_window (GTK_WINDOW (gtk_menu_get_attach_widget (GTK_MENU (menu))), uri, GDK_CURRENT_TIME, NULL);
+ gtk_show_uri_on_window(GTK_WINDOW(gtk_menu_get_attach_widget(GTK_MENU(menu))), uri, GDK_CURRENT_TIME, NULL);
#else
- gtk_show_uri (gtk_widget_get_screen (menu), uri, GDK_CURRENT_TIME, NULL);
+ gtk_show_uri(gtk_widget_get_screen(menu), uri, GDK_CURRENT_TIME, NULL);
#endif
- g_free (uri);
+ g_free(uri);
}
}
static void
-parole_media_list_add_open_containing_folder (ParoleMediaList *list, GtkWidget *menu,
+parole_media_list_add_open_containing_folder(ParoleMediaList *list, GtkWidget *menu,
gint x, gint y)
{
GtkTreePath *path;
@@ -1198,38 +1198,38 @@ parole_media_list_add_open_containing_folder (ParoleMediaList *list, GtkWidget *
const gchar *filename;
const gchar *uri;
- gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
+ gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter,
DATA_COL, &file,
-1);
- filename = parole_file_get_file_name (file);
- uri = parole_file_get_uri (file);
+ filename = parole_file_get_file_name(file);
+ uri = parole_file_get_uri(file);
if (g_str_has_prefix (uri, "file:///"))
{
GtkWidget *mi;
gchar *dirname;
- dirname = g_path_get_dirname (filename);
+ dirname = g_path_get_dirname(filename);
/* Clear */
- mi = gtk_menu_item_new_with_label (_("Open Containing Folder"));
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate",
- G_CALLBACK (parole_media_list_open_folder), menu);
+ mi = gtk_menu_item_new_with_label(_("Open Containing Folder"));
+ gtk_widget_set_sensitive(mi, TRUE);
+ gtk_widget_show(mi);
+ g_signal_connect_swapped(mi, "activate",
+ G_CALLBACK(parole_media_list_open_folder), menu);
- g_object_set_data (G_OBJECT (menu), "folder", dirname);
+ g_object_set_data(G_OBJECT(menu), "folder", dirname);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
- mi = gtk_separator_menu_item_new ();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
}
}
}
@@ -1242,46 +1242,46 @@ parole_media_list_set_playlist_view(ParoleMediaList *list, gint view)
}
void
-parole_media_list_clear_disc_list (ParoleMediaList *list)
+parole_media_list_clear_disc_list(ParoleMediaList *list)
{
- gtk_list_store_clear (GTK_LIST_STORE (list->priv->disc_store));
+ gtk_list_store_clear(GTK_LIST_STORE(list->priv->disc_store));
}
void
-parole_media_list_clear_list (ParoleMediaList *list)
+parole_media_list_clear_list(ParoleMediaList *list)
{
TRACE("CLEAR START");
- gtk_list_store_clear (GTK_LIST_STORE (list->priv->store));
+ gtk_list_store_clear(GTK_LIST_STORE(list->priv->store));
parole_media_list_set_playlist_count(list, 0);
TRACE("CLEAR END");
}
static void
-replace_list_activated_cb (GtkWidget *mi, ParoleConf *conf)
+replace_list_activated_cb(GtkWidget *mi, ParoleConf *conf)
{
- g_object_set (G_OBJECT (conf),
- "replace-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
+ g_object_set(G_OBJECT(conf),
+ "replace-playlist", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
NULL);
}
static void
-play_opened_files_activated_cb (GtkWidget *mi, ParoleConf *conf)
+play_opened_files_activated_cb(GtkWidget *mi, ParoleConf *conf)
{
- g_object_set (G_OBJECT (conf),
- "play-opened-files", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
+ g_object_set(G_OBJECT(conf),
+ "play-opened-files", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
NULL);
}
static void
-remember_playlist_activated_cb (GtkWidget *mi, ParoleConf *conf)
+remember_playlist_activated_cb(GtkWidget *mi, ParoleConf *conf)
{
gchar *playlist_filename;
GFile *playlist_file;
- g_object_set (G_OBJECT (conf),
- "remember-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
+ g_object_set(G_OBJECT(conf),
+ "remember-playlist", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
NULL);
- if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi))) {
- playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA,
+ if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi))) {
+ playlist_filename = xfce_resource_save_location(XFCE_RESOURCE_DATA,
PAROLE_AUTO_SAVED_PLAYLIST,
FALSE);
playlist_file = g_file_new_for_path(playlist_filename);
@@ -1291,22 +1291,22 @@ remember_playlist_activated_cb (GtkWidget *mi, ParoleConf *conf)
}
static void
-parole_media_list_destroy_menu (GtkWidget *menu)
+parole_media_list_destroy_menu(GtkWidget *menu)
{
gchar *dirname;
- dirname = (gchar *) g_object_get_data (G_OBJECT (menu), "folder");
+ dirname =(gchar *) g_object_get_data(G_OBJECT(menu), "folder");
if (dirname)
{
- g_free (dirname);
+ g_free(dirname);
}
- gtk_widget_destroy (menu);
+ gtk_widget_destroy(menu);
}
static void
-parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
+parole_media_list_show_menu(ParoleMediaList *list, GdkEventButton *ev)
{
gboolean val;
#if GTK_CHECK_VERSION(3, 22, 0)
@@ -1322,48 +1322,48 @@ parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
GtkCheckMenuItem *replace, *play_opened;
GtkCheckMenuItem *remember;
- builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
+ builder = parole_builder_new_from_string(playlist_ui, playlist_ui_length);
- menu = GTK_MENU (gtk_builder_get_object (builder, "playlist-menu"));
- replace = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-replace"));
- play_opened = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-play-opened"));
- remember = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-remember"));
- clear = GTK_MENU_ITEM (gtk_builder_get_object (builder, "menu-clear"));
+ menu = GTK_MENU(gtk_builder_get_object(builder, "playlist-menu"));
+ replace = GTK_CHECK_MENU_ITEM(gtk_builder_get_object(builder, "menu-replace"));
+ play_opened = GTK_CHECK_MENU_ITEM(gtk_builder_get_object(builder, "menu-play-opened"));
+ remember = GTK_CHECK_MENU_ITEM(gtk_builder_get_object(builder, "menu-remember"));
+ clear = GTK_MENU_ITEM(gtk_builder_get_object(builder, "menu-clear"));
- parole_media_list_add_open_containing_folder (list, GTK_WIDGET(menu), (gint)ev->x, (gint)ev->y);
+ parole_media_list_add_open_containing_folder(list, GTK_WIDGET(menu), (gint)ev->x, (gint)ev->y);
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"replace-playlist", &val,
NULL);
- gtk_check_menu_item_set_active (replace, val);
- g_signal_connect (replace, "activate",
- G_CALLBACK (replace_list_activated_cb), list->priv->conf);
+ gtk_check_menu_item_set_active(replace, val);
+ g_signal_connect(replace, "activate",
+ G_CALLBACK(replace_list_activated_cb), list->priv->conf);
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"play-opened-files", &val,
NULL);
- gtk_check_menu_item_set_active (play_opened, val);
- g_signal_connect (play_opened, "activate",
- G_CALLBACK (play_opened_files_activated_cb), list->priv->conf);
+ gtk_check_menu_item_set_active(play_opened, val);
+ g_signal_connect(play_opened, "activate",
+ G_CALLBACK(play_opened_files_activated_cb), list->priv->conf);
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"remember-playlist", &val,
NULL);
- gtk_check_menu_item_set_active (remember, val);
- g_signal_connect (remember, "activate",
- G_CALLBACK (remember_playlist_activated_cb), list->priv->conf);
+ gtk_check_menu_item_set_active(remember, val);
+ g_signal_connect(remember, "activate",
+ G_CALLBACK(remember_playlist_activated_cb), list->priv->conf);
- g_signal_connect_swapped (clear, "activate",
- G_CALLBACK (parole_media_list_clear_list), list);
+ g_signal_connect_swapped(clear, "activate",
+ G_CALLBACK(parole_media_list_clear_list), list);
- g_signal_connect_swapped (menu, "selection-done",
- G_CALLBACK (parole_media_list_destroy_menu), menu);
+ g_signal_connect_swapped(menu, "selection-done",
+ G_CALLBACK(parole_media_list_destroy_menu), menu);
#if GTK_CHECK_VERSION(3, 22, 0)
- gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
#else
- gtk_menu_popup (GTK_MENU (menu),
+ gtk_menu_popup(GTK_MENU(menu),
NULL, NULL,
NULL, NULL,
button, activate_time);
@@ -1371,11 +1371,11 @@ parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
}
gboolean
-parole_media_list_button_release_event (GtkWidget *widget, GdkEventButton *ev, ParoleMediaList *list)
+parole_media_list_button_release_event(GtkWidget *widget, GdkEventButton *ev, ParoleMediaList *list)
{
if ( ev->button == 3 )
{
- parole_media_list_show_menu (list, ev);
+ parole_media_list_show_menu(list, ev);
return TRUE;
}
@@ -1383,105 +1383,105 @@ parole_media_list_button_release_event (GtkWidget *widget, GdkEventButton *ev, P
}
static void
-parole_media_list_select_path (ParoleMediaList *list, gboolean disc, GtkTreePath *path)
+parole_media_list_select_path(ParoleMediaList *list, gboolean disc, GtkTreePath *path)
{
if (disc) {
- gtk_tree_selection_select_path (list->priv->disc_sel, path);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (list->priv->disc_view), path, NULL, FALSE);
+ gtk_tree_selection_select_path(list->priv->disc_sel, path);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(list->priv->disc_view), path, NULL, FALSE);
} else {
- gtk_tree_selection_select_path (list->priv->sel, path);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (list->priv->view), path, NULL, FALSE);
+ gtk_tree_selection_select_path(list->priv->sel, path);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(list->priv->view), path, NULL, FALSE);
}
}
static GtkTreeRowReference *
-parole_media_list_get_row_reference_from_iter (ParoleMediaList *list, GtkTreeIter *iter, gboolean select_path)
+parole_media_list_get_row_reference_from_iter(ParoleMediaList *list, GtkTreeIter *iter, gboolean select_path)
{
GtkTreePath *path;
GtkTreeRowReference *row;
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (list->priv->store), iter);
- row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+ path = gtk_tree_model_get_path(GTK_TREE_MODEL(list->priv->store), iter);
+ row = gtk_tree_row_reference_new(GTK_TREE_MODEL(list->priv->store), path);
if ( select_path)
- parole_media_list_select_path (list, FALSE, path);
+ parole_media_list_select_path(list, FALSE, path);
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
return row;
}
static void
-parole_media_list_finalize (GObject *object)
+parole_media_list_finalize(GObject *object)
{
ParoleMediaList *list;
- list = PAROLE_MEDIA_LIST (object);
+ list = PAROLE_MEDIA_LIST(object);
- dbus_g_connection_unref (list->priv->bus);
+ dbus_g_connection_unref(list->priv->bus);
- G_OBJECT_CLASS (parole_media_list_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_media_list_parent_class)->finalize(object);
}
static void
-parole_media_list_class_init (ParoleMediaListClass *klass)
+parole_media_list_class_init(ParoleMediaListClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_media_list_finalize;
signals[MEDIA_ACTIVATED] =
- g_signal_new ("media-activated",
+ g_signal_new("media-activated",
PAROLE_TYPE_MEDIA_LIST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleMediaListClass, media_activated),
+ G_STRUCT_OFFSET(ParoleMediaListClass, media_activated),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[MEDIA_CURSOR_CHANGED] =
- g_signal_new ("media-cursor-changed",
+ g_signal_new("media-cursor-changed",
PAROLE_TYPE_MEDIA_LIST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleMediaListClass, media_cursor_changed),
+ G_STRUCT_OFFSET(ParoleMediaListClass, media_cursor_changed),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
signals[URI_OPENED] =
- g_signal_new ("uri-opened",
+ g_signal_new("uri-opened",
PAROLE_TYPE_MEDIA_LIST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleMediaListClass, uri_opened),
+ G_STRUCT_OFFSET(ParoleMediaListClass, uri_opened),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
signals[SHOW_PLAYLIST] =
- g_signal_new ("show-playlist",
+ g_signal_new("show-playlist",
PAROLE_TYPE_MEDIA_LIST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleMediaListClass, show_playlist),
+ G_STRUCT_OFFSET(ParoleMediaListClass, show_playlist),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
signals[ISO_OPENED] =
- g_signal_new ("iso-opened",
+ g_signal_new("iso-opened",
PAROLE_TYPE_MEDIA_LIST,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleMediaListClass, iso_opened),
+ G_STRUCT_OFFSET(ParoleMediaListClass, iso_opened),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
g_type_class_add_private (klass, sizeof (ParoleMediaListPrivate));
- parole_media_list_dbus_class_init (klass);
+ parole_media_list_dbus_class_init(klass);
}
static void
-parole_media_list_playing_cell_data_func (GtkTreeViewColumn *column,
+parole_media_list_playing_cell_data_func(GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
GtkTreeModel *tree_model,
GtkTreeIter *iter,
@@ -1490,7 +1490,7 @@ parole_media_list_playing_cell_data_func (GtkTreeViewColumn *column,
const char *name = NULL;
gint state = 0;
- gtk_tree_model_get (tree_model, iter, STATE_COL, &state, -1);
+ gtk_tree_model_get(tree_model, iter, STATE_COL, &state, -1);
switch (state) {
case PAROLE_MEDIA_STATE_NONE:
@@ -1507,44 +1507,44 @@ parole_media_list_playing_cell_data_func (GtkTreeViewColumn *column,
break;
}
- g_object_set (renderer, "icon-name", name, NULL);
+ g_object_set(renderer, "icon-name", name, NULL);
}
static void
-parole_media_list_setup_view (ParoleMediaList *list)
+parole_media_list_setup_view(ParoleMediaList *list)
{
GtkTreeSelection *sel, *disc_sel;
GtkListStore *list_store, *disc_list_store;
GtkCellRenderer *renderer, *disc_renderer;
- list_store = gtk_list_store_new (COL_NUMBERS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT);
- disc_list_store = gtk_list_store_new (COL_NUMBERS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT);
+ list_store = gtk_list_store_new(COL_NUMBERS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT);
+ disc_list_store = gtk_list_store_new(COL_NUMBERS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT);
- gtk_tree_view_set_model (GTK_TREE_VIEW (list->priv->view), GTK_TREE_MODEL(list_store));
- gtk_tree_view_set_model (GTK_TREE_VIEW (list->priv->disc_view), GTK_TREE_MODEL(disc_list_store));
+ gtk_tree_view_set_model(GTK_TREE_VIEW(list->priv->view), GTK_TREE_MODEL(list_store));
+ gtk_tree_view_set_model(GTK_TREE_VIEW(list->priv->disc_view), GTK_TREE_MODEL(disc_list_store));
#if GTK_CHECK_VERSION(3, 14, 0)
#else
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list->priv->view), TRUE);
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list->priv->disc_view), TRUE);
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list->priv->view), TRUE);
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list->priv->disc_view), TRUE);
#endif
- list->priv->col = gtk_tree_view_column_new ();
- list->priv->disc_col = gtk_tree_view_column_new ();
+ list->priv->col = gtk_tree_view_column_new();
+ list->priv->disc_col = gtk_tree_view_column_new();
- renderer = gtk_cell_renderer_pixbuf_new ();
- disc_renderer = gtk_cell_renderer_pixbuf_new ();
- g_object_set (renderer, "stock-size", GTK_ICON_SIZE_MENU, NULL);
- g_object_set (disc_renderer, "stock-size", GTK_ICON_SIZE_MENU, NULL);
+ renderer = gtk_cell_renderer_pixbuf_new();
+ disc_renderer = gtk_cell_renderer_pixbuf_new();
+ g_object_set(renderer, "stock-size", GTK_ICON_SIZE_MENU, NULL);
+ g_object_set(disc_renderer, "stock-size", GTK_ICON_SIZE_MENU, NULL);
gtk_tree_view_column_pack_start(list->priv->col, renderer, FALSE);
gtk_tree_view_column_pack_start(list->priv->disc_col, disc_renderer, FALSE);
- gtk_tree_view_column_set_cell_data_func (list->priv->col, renderer,
+ gtk_tree_view_column_set_cell_data_func(list->priv->col, renderer,
(GtkTreeCellDataFunc)
parole_media_list_playing_cell_data_func,
list->priv->view,
NULL);
- gtk_tree_view_column_set_cell_data_func (list->priv->disc_col, disc_renderer,
+ gtk_tree_view_column_set_cell_data_func(list->priv->disc_col, disc_renderer,
(GtkTreeCellDataFunc)
parole_media_list_playing_cell_data_func,
list->priv->disc_view,
@@ -1557,15 +1557,15 @@ parole_media_list_setup_view (ParoleMediaList *list)
renderer = gtk_cell_renderer_text_new();
disc_renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start (list->priv->col, renderer, TRUE);
- gtk_tree_view_column_set_attributes (list->priv->col, renderer, "text", NAME_COL, NULL);
- g_object_set (renderer,
+ gtk_tree_view_column_pack_start(list->priv->col, renderer, TRUE);
+ gtk_tree_view_column_set_attributes(list->priv->col, renderer, "text", NAME_COL, NULL);
+ g_object_set(renderer,
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
- gtk_tree_view_column_pack_start (list->priv->disc_col, disc_renderer, TRUE);
- gtk_tree_view_column_set_attributes (list->priv->disc_col, disc_renderer, "text", NAME_COL, NULL);
- g_object_set (disc_renderer,
+ gtk_tree_view_column_pack_start(list->priv->disc_col, disc_renderer, TRUE);
+ gtk_tree_view_column_set_attributes(list->priv->disc_col, disc_renderer, "text", NAME_COL, NULL);
+ g_object_set(disc_renderer,
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
@@ -1580,98 +1580,98 @@ parole_media_list_setup_view (ParoleMediaList *list)
renderer = gtk_cell_renderer_text_new();
disc_renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start (list->priv->col, renderer, FALSE);
- gtk_tree_view_column_pack_start (list->priv->disc_col, disc_renderer, FALSE);
- gtk_tree_view_column_set_attributes (list->priv->col, renderer, "text", LENGTH_COL, NULL);
- gtk_tree_view_column_set_attributes (list->priv->disc_col, disc_renderer, "text", LENGTH_COL, NULL);
+ gtk_tree_view_column_pack_start(list->priv->col, renderer, FALSE);
+ gtk_tree_view_column_pack_start(list->priv->disc_col, disc_renderer, FALSE);
+ gtk_tree_view_column_set_attributes(list->priv->col, renderer, "text", LENGTH_COL, NULL);
+ gtk_tree_view_column_set_attributes(list->priv->disc_col, disc_renderer, "text", LENGTH_COL, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (list->priv->view), list->priv->col);
- gtk_tree_view_append_column (GTK_TREE_VIEW (list->priv->disc_view), list->priv->disc_col);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list->priv->view), list->priv->col);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list->priv->disc_view), list->priv->disc_col);
- gtk_tree_view_column_set_title (list->priv->col,
+ gtk_tree_view_column_set_title(list->priv->col,
g_strdup_printf(ngettext("Playlist (%i item)", "Playlist (%i items)", 0), 0));
- gtk_tree_view_column_set_title (list->priv->disc_col,
+ gtk_tree_view_column_set_title(list->priv->disc_col,
g_strdup_printf(ngettext("Playlist (%i chapter)", "Playlist (%i chapters)", 0), 0));
- gtk_drag_dest_set (list->priv->view, GTK_DEST_DEFAULT_ALL, target_entry, G_N_ELEMENTS (target_entry),
+ gtk_drag_dest_set(list->priv->view, GTK_DEST_DEFAULT_ALL, target_entry, G_N_ELEMENTS(target_entry),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
- list->priv->sel = sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->priv->view));
- list->priv->disc_sel = disc_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->priv->disc_view));
- gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE);
+ list->priv->sel = sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(list->priv->view));
+ list->priv->disc_sel = disc_sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(list->priv->disc_view));
+ gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
- g_signal_connect (sel, "changed",
- G_CALLBACK (parole_media_list_selection_changed_cb), list);
- g_signal_connect (disc_sel, "changed",
- G_CALLBACK (parole_media_list_selection_changed_cb), list);
+ g_signal_connect(sel, "changed",
+ G_CALLBACK(parole_media_list_selection_changed_cb), list);
+ g_signal_connect(disc_sel, "changed",
+ G_CALLBACK(parole_media_list_selection_changed_cb), list);
list->priv->store = list_store;
list->priv->disc_store = disc_list_store;
}
static void
-parole_media_list_init (ParoleMediaList *list)
+parole_media_list_init(ParoleMediaList *list)
{
GtkBuilder *builder;
GtkWidget *box;
media_list = list;
- list->priv = PAROLE_MEDIA_LIST_GET_PRIVATE (list);
+ list->priv = PAROLE_MEDIA_LIST_GET_PRIVATE(list);
- list->priv->bus = parole_g_session_bus_get ();
+ list->priv->bus = parole_g_session_bus_get();
- list->priv->conf = parole_conf_new ();
+ list->priv->conf = parole_conf_new();
- builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
+ builder = parole_builder_new_from_string(playlist_ui, playlist_ui_length);
- list->priv->playlist_controls = GTK_WIDGET (gtk_builder_get_object(builder, "playlist_controls"));
- list->priv->playlist_notebook = GTK_WIDGET (gtk_builder_get_object(builder, "playlist_notebook"));
+ list->priv->playlist_controls = GTK_WIDGET(gtk_builder_get_object(builder, "playlist_controls"));
+ list->priv->playlist_notebook = GTK_WIDGET(gtk_builder_get_object(builder, "playlist_notebook"));
- list->priv->view = GTK_WIDGET (gtk_builder_get_object (builder, "media-list"));
- list->priv->disc_view = GTK_WIDGET (gtk_builder_get_object (builder, "disc-list"));
+ list->priv->view = GTK_WIDGET(gtk_builder_get_object(builder, "media-list"));
+ list->priv->disc_view = GTK_WIDGET(gtk_builder_get_object(builder, "disc-list"));
- box = GTK_WIDGET (gtk_builder_get_object (builder, "playlist-box"));
+ box = GTK_WIDGET(gtk_builder_get_object(builder, "playlist-box"));
- parole_media_list_setup_view (list);
+ parole_media_list_setup_view(list);
- gtk_box_pack_start (GTK_BOX (list), box, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(list), box, TRUE, TRUE, 0);
- list->priv->remove_button = GTK_WIDGET (gtk_builder_get_object (builder, "remove-media"));
- list->priv->clear_button = GTK_WIDGET (gtk_builder_get_object (builder, "clear-media"));
- list->priv->repeat_button = GTK_WIDGET (gtk_builder_get_object (builder, "repeat-media"));
- list->priv->shuffle_button = GTK_WIDGET (gtk_builder_get_object (builder, "shuffle-media"));
+ list->priv->remove_button = GTK_WIDGET(gtk_builder_get_object(builder, "remove-media"));
+ list->priv->clear_button = GTK_WIDGET(gtk_builder_get_object(builder, "clear-media"));
+ list->priv->repeat_button = GTK_WIDGET(gtk_builder_get_object(builder, "repeat-media"));
+ list->priv->shuffle_button = GTK_WIDGET(gtk_builder_get_object(builder, "shuffle-media"));
- gtk_builder_connect_signals (builder, list);
+ gtk_builder_connect_signals(builder, list);
- g_object_unref (builder);
+ g_object_unref(builder);
- gtk_widget_show_all (GTK_WIDGET (list));
+ gtk_widget_show_all(GTK_WIDGET(list));
- parole_media_list_dbus_init (list);
+ parole_media_list_dbus_init(list);
}
GtkWidget *
-parole_media_list_get (void)
+parole_media_list_get(void)
{
static gpointer list = NULL;
- if ( G_LIKELY (list != NULL ) ) {
- g_object_ref (list);
+ if ( G_LIKELY(list != NULL ) ) {
+ g_object_ref(list);
} else {
- list = g_object_new (PAROLE_TYPE_MEDIA_LIST, NULL);
- g_object_add_weak_pointer (list, &list);
+ list = g_object_new(PAROLE_TYPE_MEDIA_LIST, NULL);
+ g_object_add_weak_pointer(list, &list);
}
return GTK_WIDGET (list);
}
-void parole_media_list_load (ParoleMediaList *list)
+void parole_media_list_load(ParoleMediaList *list)
{
gboolean load_saved_list;
gboolean play;
GSList *fileslist = NULL;
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"play-opened-files", &play,
"remember-playlist", &load_saved_list,
NULL);
@@ -1680,22 +1680,22 @@ void parole_media_list_load (ParoleMediaList *list)
{
gchar *playlist_file;
- playlist_file = xfce_resource_save_location (XFCE_RESOURCE_DATA,
+ playlist_file = xfce_resource_save_location(XFCE_RESOURCE_DATA,
PAROLE_AUTO_SAVED_PLAYLIST,
FALSE);
if ( playlist_file )
{
- fileslist = parole_pl_parser_parse_from_file_by_extension (playlist_file);
- g_free (playlist_file);
+ fileslist = parole_pl_parser_parse_from_file_by_extension(playlist_file);
+ g_free(playlist_file);
- parole_media_list_files_open (list, fileslist, FALSE, play);
- g_slist_free (fileslist);
+ parole_media_list_files_open(list, fileslist, FALSE, play);
+ g_slist_free(fileslist);
}
}
}
gboolean
-parole_media_list_add_by_path (ParoleMediaList *list, const gchar *path, gboolean emit)
+parole_media_list_add_by_path(ParoleMediaList *list, const gchar *path, gboolean emit)
{
GSList *files_list = NULL;
GtkFileFilter *filter;
@@ -1703,8 +1703,8 @@ parole_media_list_add_by_path (ParoleMediaList *list, const gchar *path, gboolea
gboolean ret = FALSE;
gchar *full_path;
- filter = parole_get_supported_media_filter ();
- g_object_ref_sink (filter);
+ filter = parole_get_supported_media_filter();
+ g_object_ref_sink(filter);
if (g_path_is_absolute(path)) {
full_path = g_strdup(path);
@@ -1715,23 +1715,23 @@ parole_media_list_add_by_path (ParoleMediaList *list, const gchar *path, gboolea
full_path = g_strdup(path);
}
}
- TRACE ("Path=%s", full_path);
+ TRACE("Path=%s", full_path);
- parole_get_media_files (filter, full_path, TRUE, &files_list);
+ parole_get_media_files(filter, full_path, TRUE, &files_list);
- parole_media_list_files_open (list, files_list, FALSE, emit);
+ parole_media_list_files_open(list, files_list, FALSE, emit);
- len = g_slist_length (files_list);
+ len = g_slist_length(files_list);
ret = len == 0 ? FALSE : TRUE;
g_free(full_path);
- g_object_unref (filter);
- g_slist_free (files_list);
+ g_object_unref(filter);
+ g_slist_free(files_list);
return ret;
}
-GtkTreeRowReference *parole_media_list_get_next_row (ParoleMediaList *list,
+GtkTreeRowReference *parole_media_list_get_next_row(ParoleMediaList *list,
GtkTreeRowReference *row,
gboolean repeat)
{
@@ -1739,58 +1739,58 @@ GtkTreeRowReference *parole_media_list_get_next_row (ParoleMediaList *list,
GtkTreePath *path;
GtkTreeIter iter;
- g_return_val_if_fail (row != NULL, NULL);
+ g_return_val_if_fail(row != NULL, NULL);
if ( !gtk_tree_row_reference_valid (row) )
return NULL;
- path = gtk_tree_row_reference_get_path (row);
+ path = gtk_tree_row_reference_get_path(row);
- gtk_tree_path_next (path);
+ gtk_tree_path_next(path);
- if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path)) {
- next = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, path)) {
+ next = gtk_tree_row_reference_new(GTK_TREE_MODEL(list->priv->store), path);
// parole_media_list_select_path (list, path);
} else if ( repeat ) { /* Repeat playing ?*/
- if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter)) {
- next = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list->priv->store), &iter)) {
+ next = parole_media_list_get_row_reference_from_iter(list, &iter, TRUE);
}
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
return next;
}
-GtkTreeRowReference *parole_media_list_get_prev_row (ParoleMediaList *list,
+GtkTreeRowReference *parole_media_list_get_prev_row(ParoleMediaList *list,
GtkTreeRowReference *row)
{
GtkTreeRowReference *prev = NULL;
GtkTreePath *path;
GtkTreeIter iter;
- g_return_val_if_fail (row != NULL, NULL);
+ g_return_val_if_fail(row != NULL, NULL);
if ( !gtk_tree_row_reference_valid (row) )
return NULL;
- path = gtk_tree_row_reference_get_path (row);
+ path = gtk_tree_row_reference_get_path(row);
- gtk_tree_path_prev (path);
+ gtk_tree_path_prev(path);
- if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path)) {
- prev = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, path)) {
+ prev = gtk_tree_row_reference_new(GTK_TREE_MODEL(list->priv->store), path);
// parole_media_list_select_path (list, path);
} else {
prev = row;
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
return prev;
}
-GtkTreeRowReference *parole_media_list_get_row_n (ParoleMediaList *list,
+GtkTreeRowReference *parole_media_list_get_row_n(ParoleMediaList *list,
gint wanted_row)
{
GtkTreeRowReference *row = NULL;
@@ -1804,13 +1804,13 @@ GtkTreeRowReference *parole_media_list_get_row_n (ParoleMediaList *list,
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
- row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+ row = gtk_tree_row_reference_new(GTK_TREE_MODEL(list->priv->store), path);
} else {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path))
- row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->disc_store), path);
+ row = gtk_tree_row_reference_new(GTK_TREE_MODEL(list->priv->disc_store), path);
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
if ( !gtk_tree_row_reference_valid (row) )
return NULL;
@@ -1818,7 +1818,7 @@ GtkTreeRowReference *parole_media_list_get_row_n (ParoleMediaList *list,
return row;
}
-GtkTreeRowReference *parole_media_list_get_row_random (ParoleMediaList *list)
+GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list)
{
GtkTreeRowReference *row = NULL;
GtkTreeIter iter;
@@ -1828,7 +1828,7 @@ GtkTreeRowReference *parole_media_list_get_row_random (ParoleMediaList *list)
gint nch;
int count = 0;
- nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store), NULL);
+ nch = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->store), NULL);
if ( nch == 1 || nch == 0 )
{
@@ -1857,7 +1857,7 @@ GtkTreeRowReference *parole_media_list_get_row_random (ParoleMediaList *list)
while (g_strcmp0(list->priv->history[0], path_str) == 0 || g_strcmp0(list->priv->history[1], path_str) == 0 || g_strcmp0(list->priv->history[2], path_str) == 0 || g_strcmp0(current_path, path_str) == 0)
{
- path_str = g_strdup_printf ("%i", g_random_int_range (0, nch));
+ path_str = g_strdup_printf("%i", g_random_int_range(0, nch));
count += 1;
if (count >= 10 && g_strcmp0(current_path, path_str) != 0)
break;
@@ -1867,24 +1867,24 @@ GtkTreeRowReference *parole_media_list_get_row_random (ParoleMediaList *list)
list->priv->history[1] = list->priv->history[0];
list->priv->history[0] = g_strdup(path_str);
- path = gtk_tree_path_new_from_string (path_str);
- g_free (path_str);
+ path = gtk_tree_path_new_from_string(path_str);
+ g_free(path_str);
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
{
- row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+ row = gtk_tree_row_reference_new(GTK_TREE_MODEL(list->priv->store), path);
if (list->priv->n_shuffled_items != -1)
{
list->priv->n_shuffled_items += 1;
}
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
return row;
}
-gboolean parole_media_list_is_selected_row (ParoleMediaList *list)
+gboolean parole_media_list_is_selected_row(ParoleMediaList *list)
{
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
return gtk_tree_selection_count_selected_rows (list->priv->sel) > 0;
@@ -1892,7 +1892,7 @@ gboolean parole_media_list_is_selected_row (ParoleMediaList *list)
return gtk_tree_selection_count_selected_rows (list->priv->disc_sel) > 0;
}
-gboolean parole_media_list_is_empty (ParoleMediaList *list)
+gboolean parole_media_list_is_empty(ParoleMediaList *list)
{
GtkTreeIter iter;
@@ -1909,17 +1909,17 @@ gboolean parole_media_list_is_empty (ParoleMediaList *list)
*
* Returns: a #GtkTreeRowReference of the first row in the media list.
**/
-GtkTreeRowReference *parole_media_list_get_first_row (ParoleMediaList *list)
+GtkTreeRowReference *parole_media_list_get_first_row(ParoleMediaList *list)
{
GtkTreeRowReference *row = NULL;
GtkTreeIter iter;
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter) )
- row = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
+ row = parole_media_list_get_row_reference_from_iter(list, &iter, TRUE);
} else {
if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->disc_store), &iter) )
- row = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
+ row = parole_media_list_get_row_reference_from_iter(list, &iter, TRUE);
}
return row;
@@ -1932,7 +1932,7 @@ GtkTreeRowReference *parole_media_list_get_first_row (ParoleMediaList *list)
*
* Returns: a #GtkTreeRowReference of the selected row.
**/
-GtkTreeRowReference *parole_media_list_get_selected_row (ParoleMediaList *list)
+GtkTreeRowReference *parole_media_list_get_selected_row(ParoleMediaList *list)
{
return parole_media_list_get_first_selected_row (list);
}
@@ -1944,46 +1944,46 @@ GtkTreeRowReference *parole_media_list_get_selected_row (ParoleMediaList *list)
*
* Returns: a #ParoleFile of the selected row.
**/
-ParoleFile *parole_media_list_get_selected_file (ParoleMediaList *list)
+ParoleFile *parole_media_list_get_selected_file(ParoleMediaList *list)
{
return parole_media_list_get_first_selected_file (list);
}
-void parole_media_list_select_row (ParoleMediaList *list, GtkTreeRowReference *row)
+void parole_media_list_select_row(ParoleMediaList *list, GtkTreeRowReference *row)
{
GtkTreePath *path;
if ( gtk_tree_row_reference_valid (row) )
{
- path = gtk_tree_row_reference_get_path (row);
- parole_media_list_select_path (list,
+ path = gtk_tree_row_reference_get_path(row);
+ parole_media_list_select_path(list,
gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 1,
path);
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
}
}
-void parole_media_list_set_row_playback_state (ParoleMediaList *list, GtkTreeRowReference *row, gint state)
+void parole_media_list_set_row_playback_state(ParoleMediaList *list, GtkTreeRowReference *row, gint state)
{
GtkTreeIter iter;
GtkTreePath *path;
- if ( gtk_tree_row_reference_valid (row) ) {
- path = gtk_tree_row_reference_get_path (row);
+ if ( gtk_tree_row_reference_valid(row) ) {
+ path = gtk_tree_row_reference_get_path(row);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
- gtk_list_store_set (list->priv->store, &iter, STATE_COL, state, -1);
+ gtk_list_store_set(list->priv->store, &iter, STATE_COL, state, -1);
} else {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
- gtk_list_store_set (list->priv->disc_store, &iter, STATE_COL, state, -1);
+ gtk_list_store_set(list->priv->disc_store, &iter, STATE_COL, state, -1);
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
}
}
-gchar* parole_media_list_get_row_name (ParoleMediaList *list,
+gchar* parole_media_list_get_row_name(ParoleMediaList *list,
GtkTreeRowReference *row)
{
GtkTreeIter iter;
@@ -1992,73 +1992,73 @@ GtkTreeRowReference *row)
if ( gtk_tree_row_reference_valid (row) )
{
- path = gtk_tree_row_reference_get_path (row);
+ path = gtk_tree_row_reference_get_path(row);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
- gtk_tree_model_get (GTK_TREE_MODEL(list->priv->store), &iter, NAME_COL, &name, -1);
+ gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter, NAME_COL, &name, -1);
} else {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
- gtk_tree_model_get (GTK_TREE_MODEL(list->priv->disc_store), &iter, NAME_COL, &name, -1);
+ gtk_tree_model_get(GTK_TREE_MODEL(list->priv->disc_store), &iter, NAME_COL, &name, -1);
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
}
return name;
}
-void parole_media_list_set_row_name (ParoleMediaList *list, GtkTreeRowReference *row, const gchar *name)
+void parole_media_list_set_row_name(ParoleMediaList *list, GtkTreeRowReference *row, const gchar *name)
{
GtkTreeIter iter;
GtkTreePath *path;
- if ( gtk_tree_row_reference_valid (row) ) {
- path = gtk_tree_row_reference_get_path (row);
+ if ( gtk_tree_row_reference_valid(row) ) {
+ path = gtk_tree_row_reference_get_path(row);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
- gtk_list_store_set (list->priv->store, &iter, NAME_COL, name, -1);
+ gtk_list_store_set(list->priv->store, &iter, NAME_COL, name, -1);
} else {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
- gtk_list_store_set (list->priv->disc_store, &iter, NAME_COL, name, -1);
+ gtk_list_store_set(list->priv->disc_store, &iter, NAME_COL, name, -1);
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
}
}
-void parole_media_list_set_row_length (ParoleMediaList *list, GtkTreeRowReference *row, const gchar *len)
+void parole_media_list_set_row_length(ParoleMediaList *list, GtkTreeRowReference *row, const gchar *len)
{
GtkTreeIter iter;
GtkTreePath *path;
- if ( gtk_tree_row_reference_valid (row) ) {
- path = gtk_tree_row_reference_get_path (row);
+ if ( gtk_tree_row_reference_valid(row) ) {
+ path = gtk_tree_row_reference_get_path(row);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
- gtk_list_store_set (list->priv->store, &iter, LENGTH_COL, len, -1);
+ gtk_list_store_set(list->priv->store, &iter, LENGTH_COL, len, -1);
} else {
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
- gtk_list_store_set (list->priv->disc_store, &iter, LENGTH_COL, len, -1);
+ gtk_list_store_set(list->priv->disc_store, &iter, LENGTH_COL, len, -1);
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
}
}
-void parole_media_list_open (ParoleMediaList *list)
+void parole_media_list_open(ParoleMediaList *list)
{
- parole_media_list_open_internal (list);
+ parole_media_list_open_internal(list);
}
-void parole_media_list_open_location (ParoleMediaList *list)
+void parole_media_list_open_location(ParoleMediaList *list)
{
- parole_media_list_open_location_internal (list);
+ parole_media_list_open_location_internal(list);
}
-gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames, gboolean enqueue)
+gboolean parole_media_list_add_files(ParoleMediaList *list, gchar **filenames, gboolean enqueue)
{
guint i;
guint added = 0;
@@ -2068,18 +2068,18 @@ gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames,
/*
* File on disk?
*/
- if ( !enqueue && g_file_test (filenames[i], G_FILE_TEST_EXISTS ) ) {
- added += parole_media_list_add_by_path (list, filenames[i], i == 0 ? TRUE : FALSE);
- } else if ( g_file_test (filenames[i], G_FILE_TEST_IS_DIR) ) {
- added += parole_media_list_add_by_path (list, filenames[i], i == 0 ? TRUE : FALSE);
+ if ( !enqueue && g_file_test(filenames[i], G_FILE_TEST_EXISTS ) ) {
+ added += parole_media_list_add_by_path(list, filenames[i], i == 0 ? TRUE : FALSE);
+ } else if ( g_file_test(filenames[i], G_FILE_TEST_IS_DIR) ) {
+ added += parole_media_list_add_by_path(list, filenames[i], i == 0 ? TRUE : FALSE);
} else {
ParoleFile *file;
- TRACE ("File=%s", filenames[i]);
- file = parole_file_new (filenames[i]);
+ TRACE("File=%s", filenames[i]);
+ file = parole_file_new(filenames[i]);
if (enqueue) {
- parole_media_list_add (list, file, FALSE, FALSE, FALSE);
+ parole_media_list_add(list, file, FALSE, FALSE, FALSE);
} else {
- parole_media_list_add (list, file, FALSE, i == 0 ? TRUE : FALSE, i == 0 ? TRUE : FALSE);
+ parole_media_list_add(list, file, FALSE, i == 0 ? TRUE : FALSE, i == 0 ? TRUE : FALSE);
}
added++;
}
@@ -2088,11 +2088,11 @@ gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames,
return added > 0;
}
-void parole_media_list_save_list (ParoleMediaList *list)
+void parole_media_list_save_list(ParoleMediaList *list)
{
gboolean save;
- g_object_get (G_OBJECT (list->priv->conf),
+ g_object_get(G_OBJECT(list->priv->conf),
"remember-playlist", &save,
NULL);
@@ -2101,28 +2101,28 @@ void parole_media_list_save_list (ParoleMediaList *list)
GSList *fileslist;
gchar *history;
- history = xfce_resource_save_location (XFCE_RESOURCE_DATA, PAROLE_AUTO_SAVED_PLAYLIST , TRUE);
+ history = xfce_resource_save_location(XFCE_RESOURCE_DATA, PAROLE_AUTO_SAVED_PLAYLIST , TRUE);
if ( !history ) {
- g_warning ("Failed to save playlist");
+ g_warning("Failed to save playlist");
return;
}
- fileslist = parole_media_list_get_files (list);
- if ( g_slist_length (fileslist) > 0 ) {
- parole_pl_parser_save_from_files (fileslist, history, PAROLE_PL_FORMAT_M3U);
- g_slist_foreach (fileslist, (GFunc) g_object_unref, NULL);
+ fileslist = parole_media_list_get_files(list);
+ if ( g_slist_length(fileslist) > 0 ) {
+ parole_pl_parser_save_from_files(fileslist, history, PAROLE_PL_FORMAT_M3U);
+ g_slist_foreach(fileslist, (GFunc)g_object_unref, NULL);
} else {
// If the playlist is empty, delete the list.
if (remove(history) != 0)
- g_warning ("Failed to remove playlist");
+ g_warning("Failed to remove playlist");
g_free(history);
}
- g_slist_free (fileslist);
+ g_slist_free(fileslist);
}
}
-static gboolean parole_media_list_dbus_add_files (ParoleMediaList *list,
+static gboolean parole_media_list_dbus_add_files(ParoleMediaList *list,
gchar **in_files, gboolean enqueue,
GError **error);
@@ -2132,35 +2132,35 @@ static gboolean parole_media_list_dbus_add_files (ParoleMediaList *list,
* DBus server implementation
*/
static void
-parole_media_list_dbus_class_init (ParoleMediaListClass *klass)
+parole_media_list_dbus_class_init(ParoleMediaListClass *klass)
{
- dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
+ dbus_g_object_type_install_info(G_TYPE_FROM_CLASS(klass),
&dbus_glib_parole_media_list_object_info);
}
static void
-parole_media_list_dbus_init (ParoleMediaList *list)
+parole_media_list_dbus_init(ParoleMediaList *list)
{
- dbus_g_connection_register_g_object (list->priv->bus,
+ dbus_g_connection_register_g_object(list->priv->bus,
PAROLE_DBUS_PLAYLIST_PATH,
- G_OBJECT (list));
+ G_OBJECT(list));
}
-static gboolean parole_media_list_dbus_add_files (ParoleMediaList *list,
+static gboolean parole_media_list_dbus_add_files(ParoleMediaList *list,
gchar **in_files, gboolean enqueue,
GError **error)
{
- TRACE ("Adding files for DBus request");
- gtk_window_present (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (list))));
- parole_media_list_add_files (list, in_files, enqueue);
+ TRACE("Adding files for DBus request");
+ gtk_window_present(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(list))));
+ parole_media_list_add_files(list, in_files, enqueue);
return TRUE;
}
-void parole_media_list_grab_focus (ParoleMediaList *list)
+void parole_media_list_grab_focus(ParoleMediaList *list)
{
if (gtk_widget_get_visible (list->priv->view) )
- gtk_widget_grab_focus (list->priv->view);
+ gtk_widget_grab_focus(list->priv->view);
}
static void
@@ -2177,7 +2177,7 @@ update_media_list_n_shuffled_items(void)
}
static void
-repeat_action_state_changed (GSimpleAction *simple, GVariant *value, gpointer user_data)
+repeat_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer user_data)
{
gboolean active = g_simple_toggle_action_get_active(simple);
@@ -2196,7 +2196,7 @@ repeat_toggled(GtkWidget *widget, GSimpleAction *simple)
g_simple_toggle_action_set_active(simple, active);
}
-void parole_media_list_connect_repeat_action (ParoleMediaList *list, GSimpleAction *simple)
+void parole_media_list_connect_repeat_action(ParoleMediaList *list, GSimpleAction *simple)
{
/* Connect state-changed event to modify widget */
g_signal_connect(G_OBJECT(simple), "notify::state", G_CALLBACK(repeat_action_state_changed), NULL);
@@ -2205,7 +2205,7 @@ void parole_media_list_connect_repeat_action (ParoleMediaList *list, GSimpleActi
}
static void
-shuffle_action_state_changed (GSimpleAction *simple, GVariant *value, gpointer user_data)
+shuffle_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer user_data)
{
gboolean active = g_simple_toggle_action_get_active(simple);
@@ -2224,7 +2224,7 @@ shuffle_toggled(GtkWidget *widget, GSimpleAction *simple)
g_simple_toggle_action_set_active(simple, active);
}
-void parole_media_list_connect_shuffle_action (ParoleMediaList *list, GSimpleAction *simple)
+void parole_media_list_connect_shuffle_action(ParoleMediaList *list, GSimpleAction *simple)
{
/* Connect state-changed event to modify widget */
g_signal_connect(G_OBJECT(simple), "notify::state", G_CALLBACK(shuffle_action_state_changed), NULL);
diff --git a/src/parole-module.c b/src/parole-module.c
index 55d2192..20feee6 100644
--- a/src/parole-module.c
+++ b/src/parole-module.c
@@ -33,13 +33,13 @@
#include "parole-module.h"
-static void parole_provider_module_plugin_init (ParoleProviderPluginIface *iface);
+static void parole_provider_module_plugin_init(ParoleProviderPluginIface *iface);
-static void parole_provider_module_class_init (ParoleProviderModuleClass *klass);
-static void parole_provider_module_init (ParoleProviderModule *module);
+static void parole_provider_module_class_init(ParoleProviderModuleClass *klass);
+static void parole_provider_module_init(ParoleProviderModule *module);
GType
-parole_provider_module_get_type (void)
+parole_provider_module_get_type(void)
{
static GType type = G_TYPE_INVALID;
@@ -66,58 +66,58 @@ parole_provider_module_get_type (void)
NULL,
};
- type = g_type_register_static (G_TYPE_TYPE_MODULE, "ParoleProviderModule", &info, 0);
- g_type_add_interface_static (type, PAROLE_TYPE_PROVIDER_PLUGIN, &plugin_info);
+ type = g_type_register_static(G_TYPE_TYPE_MODULE, "ParoleProviderModule", &info, 0);
+ g_type_add_interface_static(type, PAROLE_TYPE_PROVIDER_PLUGIN, &plugin_info);
}
return type;
}
static gboolean
-parole_module_load (GTypeModule *gtype_module)
+parole_module_load(GTypeModule *gtype_module)
{
ParoleProviderModule *module;
- module = PAROLE_PROVIDER_MODULE (gtype_module);
+ module = PAROLE_PROVIDER_MODULE(gtype_module);
- module->library = g_module_open (gtype_module->name, G_MODULE_BIND_LOCAL);
+ module->library = g_module_open(gtype_module->name, G_MODULE_BIND_LOCAL);
if ( G_UNLIKELY (module->library == NULL) )
{
- g_critical ("Failed to load plugin : %s", g_module_error ());
+ g_critical("Failed to load plugin : %s", g_module_error());
return FALSE;
}
- if ( !g_module_symbol (module->library, "parole_plugin_initialize", (gpointer) &module->initialize) ||
- !g_module_symbol (module->library, "parole_plugin_shutdown", (gpointer) &module->shutdown))
+ if ( !g_module_symbol(module->library, "parole_plugin_initialize", (gpointer)&module->initialize) ||
+ !g_module_symbol(module->library, "parole_plugin_shutdown", (gpointer)&module->shutdown))
{
- g_critical ("Plugin %s missing required symbols", gtype_module->name);
- g_module_close (module->library);
+ g_critical("Plugin %s missing required symbols", gtype_module->name);
+ g_module_close(module->library);
return FALSE;
}
- TRACE ("Loading module %s", gtype_module->name);
+ TRACE("Loading module %s", gtype_module->name);
module->provider_type = (*module->initialize) (module);
module->active = TRUE;
- TRACE ("Finished loading module %s", gtype_module->name);
+ TRACE("Finished loading module %s", gtype_module->name);
return TRUE;
}
static void
-parole_module_unload (GTypeModule *gtype_module)
+parole_module_unload(GTypeModule *gtype_module)
{
ParoleProviderModule *module;
- module = PAROLE_PROVIDER_MODULE (gtype_module);
+ module = PAROLE_PROVIDER_MODULE(gtype_module);
- TRACE ("Unloading module %s", gtype_module->name);
+ TRACE("Unloading module %s", gtype_module->name);
(*module->shutdown) ();
- g_module_close (module->library);
+ g_module_close(module->library);
module->initialize = NULL;
module->shutdown = NULL;
module->library = NULL;
@@ -126,22 +126,22 @@ parole_module_unload (GTypeModule *gtype_module)
}
static void
-parole_provider_module_class_init (ParoleProviderModuleClass *klass)
+parole_provider_module_class_init(ParoleProviderModuleClass *klass)
{
GTypeModuleClass *gtype_module_class;
- gtype_module_class = G_TYPE_MODULE_CLASS (klass);
+ gtype_module_class = G_TYPE_MODULE_CLASS(klass);
gtype_module_class->load = parole_module_load;
gtype_module_class->unload = parole_module_unload;
}
static gboolean
-parole_provider_module_get_is_configurable (ParoleProviderPlugin *plugin)
+parole_provider_module_get_is_configurable(ParoleProviderPlugin *plugin)
{
ParoleProviderModule *module;
- module = PAROLE_PROVIDER_MODULE (plugin);
+ module = PAROLE_PROVIDER_MODULE(plugin);
if ( module->instance )
return parole_provider_plugin_get_is_configurable (module->instance);
@@ -150,25 +150,25 @@ parole_provider_module_get_is_configurable (ParoleProviderPlugin *plugin)
}
static void
-parole_provider_module_configure (ParoleProviderPlugin *plugin, GtkWidget *parent)
+parole_provider_module_configure(ParoleProviderPlugin *plugin, GtkWidget *parent)
{
ParoleProviderModule *module;
- module = PAROLE_PROVIDER_MODULE (plugin);
+ module = PAROLE_PROVIDER_MODULE(plugin);
if ( module->instance )
- parole_provider_plugin_configure (module->instance, parent);
+ parole_provider_plugin_configure(module->instance, parent);
}
static void
-parole_provider_module_plugin_init (ParoleProviderPluginIface *iface)
+parole_provider_module_plugin_init(ParoleProviderPluginIface *iface)
{
iface->get_is_configurable = parole_provider_module_get_is_configurable;
iface->configure = parole_provider_module_configure;
}
static void
-parole_provider_module_init (ParoleProviderModule *module)
+parole_provider_module_init(ParoleProviderModule *module)
{
module->library = NULL;
module->library_name = NULL;
@@ -183,20 +183,20 @@ parole_provider_module_init (ParoleProviderModule *module)
}
ParoleProviderModule *
-parole_provider_module_new (const gchar *filename, const gchar *desktop_file, const gchar *library_name)
+parole_provider_module_new(const gchar *filename, const gchar *desktop_file, const gchar *library_name)
{
ParoleProviderModule *module = NULL;
- module = g_object_new (PAROLE_TYPE_PROVIDER_MODULE, NULL);
+ module = g_object_new(PAROLE_TYPE_PROVIDER_MODULE, NULL);
- g_type_module_set_name (G_TYPE_MODULE (module), filename);
+ g_type_module_set_name(G_TYPE_MODULE(module), filename);
- module->desktop_file = g_strdup (desktop_file);
- g_object_set_data_full (G_OBJECT (module), "desktop-file",
+ module->desktop_file = g_strdup(desktop_file);
+ g_object_set_data_full(G_OBJECT(module), "desktop-file",
module->desktop_file, (GDestroyNotify) g_free);
- module->library_name = g_strdup (library_name);
- g_object_set_data_full (G_OBJECT (module), "library-name",
+ module->library_name = g_strdup(library_name);
+ g_object_set_data_full(G_OBJECT(module), "library-name",
module->library_name, (GDestroyNotify) g_free);
return module;
@@ -208,50 +208,50 @@ parole_provider_module_new (const gchar *filename, const gchar *desktop_file, co
*
* Initialize the #ParoleProviderModule plugin. Return #TRUE if successful.
**/
-gboolean parole_provider_module_new_plugin (ParoleProviderModule *module)
+gboolean parole_provider_module_new_plugin(ParoleProviderModule *module)
{
- TRACE ("start");
+ TRACE("start");
- g_return_val_if_fail (PAROLE_IS_PROVIDER_MODULE (module), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_MODULE(module), FALSE);
#ifdef debug
- g_return_val_if_fail (module->active == TRUE, FALSE);
- g_return_val_if_fail (module->instance == NULL, FALSE);
- g_return_val_if_fail (module->player == NULL, FALSE);
+ g_return_val_if_fail(module->active == TRUE, FALSE);
+ g_return_val_if_fail(module->instance == NULL, FALSE);
+ g_return_val_if_fail(module->player == NULL, FALSE);
#endif
- module->instance = g_object_new (module->provider_type, NULL);
- g_return_val_if_fail (PAROLE_IS_PROVIDER_PLUGIN (PAROLE_PROVIDER_PLUGIN (module->instance)), FALSE);
+ module->instance = g_object_new(module->provider_type, NULL);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_PLUGIN(PAROLE_PROVIDER_PLUGIN(module->instance)), FALSE);
- module->player = parole_plugin_player_new ();
- parole_provider_plugin_set_player (PAROLE_PROVIDER_PLUGIN (module->instance), PAROLE_PROVIDER_PLAYER (module->player));
+ module->player = parole_plugin_player_new();
+ parole_provider_plugin_set_player(PAROLE_PROVIDER_PLUGIN(module->instance), PAROLE_PROVIDER_PLAYER(module->player));
return TRUE;
}
-void parole_provider_module_free_plugin (ParoleProviderModule *module)
+void parole_provider_module_free_plugin(ParoleProviderModule *module)
{
- TRACE ("start");
+ TRACE("start");
- g_return_if_fail (PAROLE_IS_PROVIDER_MODULE (module));
+ g_return_if_fail(PAROLE_IS_PROVIDER_MODULE(module));
if ( module->instance )
{
- g_object_unref (module->instance);
+ g_object_unref(module->instance);
module->instance = NULL;
}
if ( module->player )
{
- g_object_unref (module->player);
+ g_object_unref(module->player);
module->player = NULL;
}
}
gboolean
-parole_provider_module_get_is_active (ParoleProviderModule *module)
+parole_provider_module_get_is_active(ParoleProviderModule *module)
{
- g_return_val_if_fail (PAROLE_IS_PROVIDER_MODULE (module), FALSE);
+ g_return_val_if_fail(PAROLE_IS_PROVIDER_MODULE(module), FALSE);
return module->active;
}
diff --git a/src/parole-open-location.c b/src/parole-open-location.c
index 59943df..e5496a5 100644
--- a/src/parole-open-location.c
+++ b/src/parole-open-location.c
@@ -36,7 +36,7 @@
#include "interfaces/open-location_ui.h"
-static void parole_open_location_finalize (GObject *object);
+static void parole_open_location_finalize(GObject *object);
struct ParoleOpenLocation
{
@@ -49,7 +49,7 @@ struct ParoleOpenLocationClass
{
GObjectClass parent_class;
- void (*location_opened) (ParoleOpenLocation *self,
+ void(*location_opened)(ParoleOpenLocation *self,
const gchar *address);
};
@@ -67,11 +67,11 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (ParoleOpenLocation, parole_open_location, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleOpenLocation, parole_open_location, G_TYPE_OBJECT)
/* Callback for the open button which passes on the location and closes the dialog */
static void
-parole_open_location_response_cb (GtkDialog *dialog, gint response_id, ParoleOpenLocation *self)
+parole_open_location_response_cb(GtkDialog *dialog, gint response_id, ParoleOpenLocation *self)
{
const gchar *location;
@@ -80,33 +80,33 @@ parole_open_location_response_cb (GtkDialog *dialog, gint response_id, ParoleOpe
if ( response_id == GTK_RESPONSE_OK )
{
- location = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(self->entry));
+ location = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(self->entry));
if ( !location || strlen (location) == 0)
goto out;
- TRACE ("Location %s", location);
+ TRACE("Location %s", location);
- gtk_widget_hide (GTK_WIDGET (dialog));
- g_signal_emit (G_OBJECT (self), signals[LOCATION_OPENED], 0, location);
+ gtk_widget_hide(GTK_WIDGET(dialog));
+ g_signal_emit(G_OBJECT(self), signals[LOCATION_OPENED], 0, location);
}
out:
- gtk_widget_destroy (GTK_WIDGET (dialog));
+ gtk_widget_destroy(GTK_WIDGET(dialog));
}
/* Populate the history-popup */
static GtkTreeModel *
-parole_open_location_get_completion_model (void)
+parole_open_location_get_completion_model(void)
{
GtkListStore *store;
GtkTreeIter iter;
gchar **lines = NULL;
guint i;
- store = gtk_list_store_new (N_COLS, G_TYPE_STRING);
+ store = gtk_list_store_new(N_COLS, G_TYPE_STRING);
- lines = parole_get_history ();
+ lines = parole_get_history();
if ( lines )
{
@@ -114,22 +114,22 @@ parole_open_location_get_completion_model (void)
{
if ( g_strcmp0(lines[i], "") != 0 )
{
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
COL_ADDRESS, lines[i],
-1);
}
}
- g_strfreev (lines);
+ g_strfreev(lines);
}
return GTK_TREE_MODEL (store);
}
static void
-parole_open_location_class_init (ParoleOpenLocationClass *klass)
+parole_open_location_class_init(ParoleOpenLocationClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_open_location_finalize;
@@ -137,69 +137,69 @@ parole_open_location_class_init (ParoleOpenLocationClass *klass)
g_signal_new("location-opened",
PAROLE_TYPE_OPEN_LOCATION,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleOpenLocationClass, location_opened),
+ G_STRUCT_OFFSET(ParoleOpenLocationClass, location_opened),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
}
static void
-parole_open_location_init (ParoleOpenLocation *self)
+parole_open_location_init(ParoleOpenLocation *self)
{
}
static void
-parole_open_location_finalize (GObject *object)
+parole_open_location_finalize(GObject *object)
{
- G_OBJECT_CLASS (parole_open_location_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_open_location_parent_class)->finalize(object);
}
/* Clear the location history */
static void
-parole_open_location_clear_history (GtkTreeModel *model)
+parole_open_location_clear_history(GtkTreeModel *model)
{
- parole_clear_history_file ();
- gtk_list_store_clear (GTK_LIST_STORE (model));
+ parole_clear_history_file();
+ gtk_list_store_clear(GTK_LIST_STORE(model));
}
/* Main function to open the "open location" dialog */
-ParoleOpenLocation *parole_open_location (GtkWidget *parent)
+ParoleOpenLocation *parole_open_location(GtkWidget *parent)
{
ParoleOpenLocation *self;
GtkWidget *dialog;
GtkTreeModel *model;
GtkBuilder *builder;
- self = g_object_new (PAROLE_TYPE_OPEN_LOCATION, NULL);
+ self = g_object_new(PAROLE_TYPE_OPEN_LOCATION, NULL);
- builder = parole_builder_new_from_string (open_location_ui, open_location_ui_length);
+ builder = parole_builder_new_from_string(open_location_ui, open_location_ui_length);
- dialog = GTK_WIDGET (gtk_builder_get_object (builder, "open-location"));
+ dialog = GTK_WIDGET(gtk_builder_get_object(builder, "open-location"));
if ( parent )
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
+ gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent));
- gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
+ gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT);
- self->entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
- model = parole_open_location_get_completion_model ();
+ self->entry = GTK_WIDGET(gtk_builder_get_object(builder, "entry"));
+ model = parole_open_location_get_completion_model();
gtk_combo_box_set_model(GTK_COMBO_BOX(self->entry), model);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- g_signal_connect_swapped (gtk_builder_get_object (builder, "clear-history"), "clicked",
- G_CALLBACK (parole_open_location_clear_history), model);
- gtk_widget_set_tooltip_text (GTK_WIDGET (gtk_builder_get_object (builder, "clear-history")), _("Clear History"));
+ g_signal_connect_swapped(gtk_builder_get_object(builder, "clear-history"), "clicked",
+ G_CALLBACK(parole_open_location_clear_history), model);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(gtk_builder_get_object(builder, "clear-history")), _("Clear History"));
- g_signal_connect (dialog, "delete-event",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect(dialog, "delete-event",
+ G_CALLBACK(gtk_widget_destroy), NULL);
- g_signal_connect (dialog, "response",
- G_CALLBACK (parole_open_location_response_cb), self);
+ g_signal_connect(dialog, "response",
+ G_CALLBACK(parole_open_location_response_cb), self);
- gtk_widget_show_all (dialog);
- g_object_unref (builder);
+ gtk_widget_show_all(dialog);
+ g_object_unref(builder);
return self;
}
diff --git a/src/parole-player.c b/src/parole-player.c
index c590929..d661d87 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -87,7 +87,7 @@ gboolean block_playlist_updates = FALSE;
ParolePlayer *parole_player = NULL;
static void
-get_time_string (gchar *timestring, gint total_seconds)
+get_time_string(gchar *timestring, gint total_seconds)
{
gint hours;
gint minutes;
@@ -99,168 +99,168 @@ get_time_string (gchar *timestring, gint total_seconds)
minutes = minutes % 60;
if ( hours == 0 ) {
- g_snprintf (timestring, 128, "%02i:%02i", minutes, seconds);
+ g_snprintf(timestring, 128, "%02i:%02i", minutes, seconds);
} else {
- g_snprintf (timestring, 128, "%i:%02i:%02i", hours, minutes, seconds);
+ g_snprintf(timestring, 128, "%i:%02i:%02i", hours, minutes, seconds);
}
}
/*
* DBus Glib init
*/
-static void parole_player_dbus_class_init (ParolePlayerClass *klass);
-static void parole_player_dbus_init (ParolePlayer *player);
+static void parole_player_dbus_class_init(ParolePlayerClass *klass);
+static void parole_player_dbus_init(ParolePlayer *player);
-static void parole_player_disc_selected_cb (ParoleDisc *disc,
+static void parole_player_disc_selected_cb(ParoleDisc *disc,
const gchar *uri,
const gchar *device,
ParolePlayer *player);
-static void parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data);
+static void parole_player_select_custom_subtitle(GtkMenuItem *widget, gpointer data);
-static gboolean parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data);
+static gboolean parole_overlay_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data);
-static gboolean parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player);
+static gboolean parole_audiobox_expose_event(GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player);
/*
* GtkBuilder Callbacks
*/
-void on_content_area_size_allocate (GtkWidget *widget,
+void on_content_area_size_allocate(GtkWidget *widget,
GtkAllocation *allocation,
ParolePlayer *player);
-gboolean parole_player_configure_event_cb (GtkWidget *widget,
+gboolean parole_player_configure_event_cb(GtkWidget *widget,
GdkEventConfigure *ev,
ParolePlayer *player);
-gboolean parole_player_range_button_press (GtkWidget *widget,
+gboolean parole_player_range_button_press(GtkWidget *widget,
GdkEventButton *ev,
ParolePlayer *player);
-gboolean parole_player_range_button_release (GtkWidget *widget,
+gboolean parole_player_range_button_release(GtkWidget *widget,
GdkEventButton *ev,
ParolePlayer *player);
-void parole_player_range_value_changed (GtkRange *range,
+void parole_player_range_value_changed(GtkRange *range,
ParolePlayer *player);
-void parole_player_playpause_action_cb (GSimpleAction *action);
+void parole_player_playpause_action_cb(GSimpleAction *action);
-void parole_player_pause_clicked (GtkButton *button,
+void parole_player_pause_clicked(GtkButton *button,
ParolePlayer *player);
-void parole_player_next_action_cb (GSimpleAction *action);
+void parole_player_next_action_cb(GSimpleAction *action);
-void parole_player_previous_action_cb (GSimpleAction *action);
+void parole_player_previous_action_cb(GSimpleAction *action);
-void parole_player_toggle_playlist_action_cb (GSimpleAction *action);
+void parole_player_toggle_playlist_action_cb(GSimpleAction *action);
-void parole_player_fullscreen_action_cb (GSimpleAction *action);
+void parole_player_fullscreen_action_cb(GSimpleAction *action);
-void parole_player_seekf_cb (GtkWidget *widget,
+void parole_player_seekf_cb(GtkWidget *widget,
ParolePlayer *player,
gdouble seek);
-void parole_player_seekb_cb (GtkWidget *widget,
+void parole_player_seekb_cb(GtkWidget *widget,
ParolePlayer *player,
gdouble seek);
-gboolean parole_player_window_state_event (GtkWidget *widget,
+gboolean parole_player_window_state_event(GtkWidget *widget,
GdkEventWindowState *event,
ParolePlayer *player);
-void parole_player_destroy_cb (GObject *window,
+void parole_player_destroy_cb(GObject *window,
ParolePlayer *player);
-gboolean parole_player_delete_event_cb (GtkWidget *widget,
+gboolean parole_player_delete_event_cb(GtkWidget *widget,
GdkEvent *ev,
ParolePlayer *player);
-void parole_player_reset_controls (ParolePlayer *player,
+void parole_player_reset_controls(ParolePlayer *player,
gboolean fullscreen);
/*Menu items callbacks*/
-void parole_player_menu_open_location_cb (GtkWidget *widget,
+void parole_player_menu_open_location_cb(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_menu_add_cb (GtkWidget *widget,
+void parole_player_menu_add_cb(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_media_menu_select_cb (GtkMenuItem *widget,
+void parole_player_media_menu_select_cb(GtkMenuItem *widget,
ParolePlayer *player);
-void parole_player_save_playlist_cb (GtkWidget *widget,
+void parole_player_save_playlist_cb(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_menu_exit_cb (GtkWidget *widget,
+void parole_player_menu_exit_cb(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_volume_up (GtkWidget *widget,
+void parole_player_volume_up(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_volume_down (GtkWidget *widget,
+void parole_player_volume_down(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_volume_mute (GtkWidget *widget,
+void parole_player_volume_mute(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_open_preferences_cb (GtkWidget *widget,
+void parole_player_open_preferences_cb(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_volume_value_changed_cb (GtkScaleButton *widget,
+void parole_player_volume_value_changed_cb(GtkScaleButton *widget,
gdouble value,
ParolePlayer *player);
-gboolean parole_player_volume_scroll_event_cb (GtkWidget *widget,
+gboolean parole_player_volume_scroll_event_cb(GtkWidget *widget,
GdkEventScroll *ev,
ParolePlayer *player);
-static void parole_player_clear_subtitles (ParolePlayer *player);
+static void parole_player_clear_subtitles(ParolePlayer *player);
-static void parole_player_clear_audio_tracks (ParolePlayer *player);
+static void parole_player_clear_audio_tracks(ParolePlayer *player);
/*
* Aspect ratio
*/
-void ratio_none_toggled_cb (GtkWidget *widget,
+void ratio_none_toggled_cb(GtkWidget *widget,
ParolePlayer *player);
-void ratio_auto_toggled_cb (GtkWidget *widget,
+void ratio_auto_toggled_cb(GtkWidget *widget,
ParolePlayer *player);
-void ratio_square_toggled_cb (GtkWidget *widget,
+void ratio_square_toggled_cb(GtkWidget *widget,
ParolePlayer *player);
-void ratio_4_3_toggled_cb (GtkWidget *widget,
+void ratio_4_3_toggled_cb(GtkWidget *widget,
ParolePlayer *player);
-void ratio_16_9_toggled_cb (GtkWidget *widget,
+void ratio_16_9_toggled_cb(GtkWidget *widget,
ParolePlayer *player);
-void ratio_20_9_toggled_cb (GtkWidget *widget,
+void ratio_20_9_toggled_cb(GtkWidget *widget,
ParolePlayer *player);
-void parole_player_set_playlist_visible (ParolePlayer *player,
+void parole_player_set_playlist_visible(ParolePlayer *player,
gboolean visibility);
-gboolean parole_player_gst_widget_button_press (GtkWidget *widget,
+gboolean parole_player_gst_widget_button_press(GtkWidget *widget,
GdkEventButton *ev,
ParolePlayer *player);
-gboolean parole_player_gst_widget_button_release (GtkWidget *widget,
+gboolean parole_player_gst_widget_button_release(GtkWidget *widget,
GdkEventButton *ev,
ParolePlayer *player);
gboolean
-parole_player_gst_widget_motion_notify_event (GtkWidget *widget,
+parole_player_gst_widget_motion_notify_event(GtkWidget *widget,
GdkEventMotion *ev,
ParolePlayer *player);
-void parole_show_about (GtkWidget *widget,
+void parole_show_about(GtkWidget *widget,
ParolePlayer *player);
-void parole_show_shortcuts (GtkWidget *widget,
+void parole_show_shortcuts(GtkWidget *widget,
ParolePlayer *player);
void parole_player_set_audiotrack_radio_menu_item_selected(
@@ -272,56 +272,56 @@ void parole_player_set_subtitle_radio_menu_item_selected(
gint sub_index);
void
-parole_player_combo_box_audiotrack_changed_cb (GtkWidget *widget,
+parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget,
ParolePlayer *player);
void
-parole_player_combo_box_subtitles_changed_cb (GtkWidget *widget,
+parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget,
ParolePlayer *player);
static void
-parole_player_audiotrack_radio_menu_item_changed_cb (GtkWidget *widget,
+parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget,
ParolePlayer *player);
static void
-parole_player_subtitles_radio_menu_item_changed_cb (GtkWidget *widget,
+parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget,
ParolePlayer *player);
static void
-parole_player_dvd_chapter_count_change_cb (ParoleGst *gst,
+parole_player_dvd_chapter_count_change_cb(ParoleGst *gst,
gint chapter_count,
ParolePlayer *player);
-static void parole_player_dvd_chapter_change_cb (ParoleGst *gst,
+static void parole_player_dvd_chapter_change_cb(ParoleGst *gst,
gint chapter_count,
ParolePlayer *player);
-void parole_player_dvd_menu_activated (GtkMenuItem *widget,
+void parole_player_dvd_menu_activated(GtkMenuItem *widget,
ParolePlayer *player);
-void parole_player_dvd_title_activated (GtkMenuItem *widget,
+void parole_player_dvd_title_activated(GtkMenuItem *widget,
ParolePlayer *player);
-void parole_player_dvd_audio_activated (GtkMenuItem *widget,
+void parole_player_dvd_audio_activated(GtkMenuItem *widget,
ParolePlayer *player);
-void parole_player_dvd_angle_activated (GtkMenuItem *widget,
+void parole_player_dvd_angle_activated(GtkMenuItem *widget,
ParolePlayer *player);
-void parole_player_dvd_chapter_activated (GtkMenuItem *widget,
+void parole_player_dvd_chapter_activated(GtkMenuItem *widget,
ParolePlayer *player);
-gboolean parole_player_key_press (GtkWidget *widget,
+gboolean parole_player_key_press(GtkWidget *widget,
GdkEventKey *ev,
ParolePlayer *player);
-void parole_player_widget_activate_action (GtkWidget *widget,
+void parole_player_widget_activate_action(GtkWidget *widget,
GSimpleAction *action);
-static void parole_player_set_cursor_visible (ParolePlayer *player,
+static void parole_player_set_cursor_visible(ParolePlayer *player,
gboolean visible);
-gboolean parole_player_hide_controls (gpointer data);
+gboolean parole_player_hide_controls(gpointer data);
static GtkTargetEntry target_entry[] =
{
@@ -333,7 +333,7 @@ static GtkTargetEntry target_entry[] =
* End of GtkBuilder Callbacks
*/
#define PAROLE_PLAYER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_PLAYER, ParolePlayerPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_PLAYER, ParolePlayerPrivate))
struct ParolePlayerPrivate
{
@@ -466,84 +466,84 @@ enum
PROP_CLIENT_ID
};
-G_DEFINE_TYPE (ParolePlayer, parole_player, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParolePlayer, parole_player, G_TYPE_OBJECT)
-void parole_show_about (GtkWidget *widget, ParolePlayer *player)
+void parole_show_about(GtkWidget *widget, ParolePlayer *player)
{
- parole_about (GTK_WINDOW (player->priv->window));
+ parole_about(GTK_WINDOW(player->priv->window));
}
-void parole_show_shortcuts (GtkWidget *widget, ParolePlayer *player)
+void parole_show_shortcuts(GtkWidget *widget, ParolePlayer *player)
{
- parole_shortcuts (GTK_WIDGET (player->priv->window));
+ parole_shortcuts(GTK_WIDGET(player->priv->window));
}
-void ratio_none_toggled_cb (GtkWidget *widget, ParolePlayer *player)
+void ratio_none_toggled_cb(GtkWidget *widget, ParolePlayer *player)
{
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"aspect-ratio", PAROLE_ASPECT_RATIO_NONE,
NULL);
}
-void ratio_auto_toggled_cb (GtkWidget *widget, ParolePlayer *player)
+void ratio_auto_toggled_cb(GtkWidget *widget, ParolePlayer *player)
{
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"aspect-ratio", PAROLE_ASPECT_RATIO_AUTO,
NULL);
}
-void ratio_square_toggled_cb (GtkWidget *widget, ParolePlayer *player)
+void ratio_square_toggled_cb(GtkWidget *widget, ParolePlayer *player)
{
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"aspect-ratio", PAROLE_ASPECT_RATIO_SQUARE,
NULL);
}
-void ratio_4_3_toggled_cb (GtkWidget *widget, ParolePlayer *player)
+void ratio_4_3_toggled_cb(GtkWidget *widget, ParolePlayer *player)
{
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"aspect-ratio", PAROLE_ASPECT_RATIO_4_3,
NULL);
}
-void ratio_16_9_toggled_cb (GtkWidget *widget, ParolePlayer *player)
+void ratio_16_9_toggled_cb(GtkWidget *widget, ParolePlayer *player)
{
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"aspect-ratio", PAROLE_ASPECT_RATIO_16_9,
NULL);
}
-void ratio_20_9_toggled_cb (GtkWidget *widget, ParolePlayer *player)
+void ratio_20_9_toggled_cb(GtkWidget *widget, ParolePlayer *player)
{
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"aspect-ratio", PAROLE_ASPECT_RATIO_DVB,
NULL);
}
-void parole_player_widget_activate_action (GtkWidget *widget,
+void parole_player_widget_activate_action(GtkWidget *widget,
GSimpleAction *action)
{
- g_action_activate (G_ACTION(action), NULL);
+ g_action_activate(G_ACTION(action), NULL);
}
-static void toggle_action_cb (GtkWidget *widget, GSimpleAction *action)
+static void toggle_action_cb(GtkWidget *widget, GSimpleAction *action)
{
if (!block_playlist_updates)
- g_simple_toggle_action_set_active (action,
+ g_simple_toggle_action_set_active(action,
!g_simple_toggle_action_get_active(action));
}
-void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibility)
+void parole_player_set_playlist_visible(ParolePlayer *player, gboolean visibility)
{
gint window_w, window_h, playlist_w;
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
- gtk_widget_set_tooltip_text (GTK_WIDGET(player->priv->showhide_playlist_button), visibility ? _("Hide Playlist") : _("Show Playlist"));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->showhide_playlist_button), visibility ? _("Hide Playlist") : _("Show Playlist"));
if (gtk_widget_get_visible (player->priv->playlist_nt) == visibility)
return;
- gtk_window_get_size (GTK_WINDOW (player->priv->window), &window_w, &window_h);
+ gtk_window_get_size(GTK_WINDOW(player->priv->window), &window_w, &window_h);
/* Get the playlist width. If we fail to get it, use the default 220. */
gtk_widget_get_allocation(GTK_WIDGET(player->priv->playlist_nt), allocation);
@@ -552,38 +552,38 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
playlist_w = 220;
g_simple_toggle_action_set_active(player->priv->toggle_playlist_action, visibility);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(player->priv->showhide_playlist_menu_item), visibility);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(player->priv->showhide_playlist_button), visibility);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->showhide_playlist_menu_item), visibility);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(player->priv->showhide_playlist_button), visibility);
if ( visibility ) {
if ( !player->priv->full_screen )
- gtk_window_resize(GTK_WINDOW (player->priv->window), window_w+playlist_w+player->priv->handle_width, window_h);
+ gtk_window_resize(GTK_WINDOW(player->priv->window), window_w+playlist_w+player->priv->handle_width, window_h);
- gtk_widget_show (player->priv->playlist_nt);
- g_object_set (G_OBJECT (player->priv->conf),
+ gtk_widget_show(player->priv->playlist_nt);
+ g_object_set(G_OBJECT(player->priv->conf),
"showhide-playlist", TRUE,
NULL);
} else {
- gtk_widget_hide (player->priv->playlist_nt);
- g_object_set (G_OBJECT (player->priv->conf),
+ gtk_widget_hide(player->priv->playlist_nt);
+ g_object_set(G_OBJECT(player->priv->conf),
"showhide-playlist", FALSE,
NULL);
if ( !player->priv->full_screen )
- gtk_window_resize(GTK_WINDOW (player->priv->window), window_w-playlist_w-player->priv->handle_width, window_h);
+ gtk_window_resize(GTK_WINDOW(player->priv->window), window_w-playlist_w-player->priv->handle_width, window_h);
}
}
-void parole_player_toggle_playlist_action_cb (GSimpleAction *action)
+void parole_player_toggle_playlist_action_cb(GSimpleAction *action)
{
gboolean visible;
- visible = gtk_widget_get_visible (parole_player->priv->playlist_nt);
+ visible = gtk_widget_get_visible(parole_player->priv->playlist_nt);
- parole_player_set_playlist_visible (parole_player, !visible);
+ parole_player_set_playlist_visible(parole_player, !visible);
}
static void
-parole_player_change_range_value (ParolePlayer *player, gdouble value)
+parole_player_change_range_value(ParolePlayer *player, gdouble value)
{
gchar pos_text[128];
@@ -591,88 +591,88 @@ parole_player_change_range_value (ParolePlayer *player, gdouble value)
{
player->priv->internal_range_change = TRUE;
- gtk_range_set_value (GTK_RANGE (player->priv->range), value);
+ gtk_range_set_value(GTK_RANGE(player->priv->range), value);
player->priv->internal_range_change = FALSE;
}
- get_time_string (pos_text, value);
- gtk_label_set_text (GTK_LABEL (player->priv->label_elapsed), pos_text);
+ get_time_string(pos_text, value);
+ gtk_label_set_text(GTK_LABEL(player->priv->label_elapsed), pos_text);
}
static void
-parole_player_reset (ParolePlayer *player)
+parole_player_reset(ParolePlayer *player)
{
- parole_gst_stop (PAROLE_GST (player->priv->gst));
+ parole_gst_stop(PAROLE_GST(player->priv->gst));
player->priv->update_languages = TRUE;
- gtk_window_set_title (GTK_WINDOW (player->priv->window), _("Parole Media Player"));
+ gtk_window_set_title(GTK_WINDOW(player->priv->window), _("Parole Media Player"));
gtk_widget_hide(GTK_WIDGET(player->priv->dvd_menu));
player->priv->audio_list = NULL;
player->priv->subtitle_list = NULL;
gtk_widget_hide(GTK_WIDGET(player->priv->infobar));
- parole_player_change_range_value (player, 0);
+ parole_player_change_range_value(player, 0);
if ( player->priv->row )
{
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
- gtk_tree_row_reference_free (player->priv->row);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
+ gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
}
if (player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD)
{
TRACE("CLEAR DVD LIST");
- parole_media_list_clear_disc_list (player->priv->list);
+ parole_media_list_clear_disc_list(player->priv->list);
TRACE("END CLEAR DVD LIST");
}
player->priv->current_media_type = PAROLE_MEDIA_TYPE_UNKNOWN;
parole_media_list_set_playlist_view(player->priv->list, PAROLE_MEDIA_LIST_PLAYLIST_VIEW_STANDARD);
- g_simple_action_set_enabled (player->priv->toggle_repeat_action, TRUE);
- g_simple_action_set_enabled (player->priv->toggle_shuffle_action, TRUE);
+ g_simple_action_set_enabled(player->priv->toggle_repeat_action, TRUE);
+ g_simple_action_set_enabled(player->priv->toggle_shuffle_action, TRUE);
}
static void
-parole_player_dvd_reset (ParolePlayer *player)
+parole_player_dvd_reset(ParolePlayer *player)
{
if ( player->priv->row )
{
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
- gtk_tree_row_reference_free (player->priv->row);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
+ gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
}
}
void
-parole_player_dvd_menu_activated (GtkMenuItem *widget, ParolePlayer *player)
+parole_player_dvd_menu_activated(GtkMenuItem *widget, ParolePlayer *player)
{
- parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_ROOT_MENU);
+ parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_ROOT_MENU);
}
void
-parole_player_dvd_title_activated (GtkMenuItem *widget, ParolePlayer *player)
+parole_player_dvd_title_activated(GtkMenuItem *widget, ParolePlayer *player)
{
- parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_TITLE_MENU);
+ parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_TITLE_MENU);
}
void
-parole_player_dvd_audio_activated (GtkMenuItem *widget, ParolePlayer *player)
+parole_player_dvd_audio_activated(GtkMenuItem *widget, ParolePlayer *player)
{
- parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_AUDIO_MENU);
+ parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_AUDIO_MENU);
}
void
-parole_player_dvd_angle_activated (GtkMenuItem *widget, ParolePlayer *player)
+parole_player_dvd_angle_activated(GtkMenuItem *widget, ParolePlayer *player)
{
- parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_ANGLE_MENU);
+ parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_ANGLE_MENU);
}
void
-parole_player_dvd_chapter_activated (GtkMenuItem *widget, ParolePlayer *player)
+parole_player_dvd_chapter_activated(GtkMenuItem *widget, ParolePlayer *player)
{
- parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_CHAPTER_MENU);
+ parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_CHAPTER_MENU);
}
static gboolean
@@ -694,18 +694,18 @@ parole_sublang_equal_lists (GList *orig, GList *new)
n = new;
while (o != NULL && n != NULL && retval != FALSE)
{
- if (g_str_equal (o->data, n->data) == FALSE) {
+ if (g_str_equal(o->data, n->data) == FALSE) {
retval = FALSE;
}
- o = g_list_next (o);
- n = g_list_next (n);
+ o = g_list_next(o);
+ n = g_list_next(n);
}
return retval;
}
static void
-parole_player_clear_chapters (ParolePlayer *player)
+parole_player_clear_chapters(ParolePlayer *player)
{
GList *menu_items, *menu_iter;
gint counter = 0;
@@ -730,7 +730,7 @@ parole_player_chapter_selection_changed_cb(GtkWidget *widget, ParolePlayer *play
}
static void
-parole_player_update_chapters (ParolePlayer *player, gint chapter_count)
+parole_player_update_chapters(ParolePlayer *player, gint chapter_count)
{
int chapter_id;
GtkWidget *menu_item;
@@ -738,19 +738,19 @@ parole_player_update_chapters (ParolePlayer *player, gint chapter_count)
for (chapter_id=0; chapter_id < chapter_count; chapter_id++)
{
- menu_item = GTK_WIDGET(gtk_menu_item_new_with_label (g_strdup_printf(_("Chapter %i"), chapter_id+1)));
- gtk_widget_show (menu_item);
+ menu_item = GTK_WIDGET(gtk_menu_item_new_with_label(g_strdup_printf(_("Chapter %i"), chapter_id+1)));
+ gtk_widget_show(menu_item);
g_object_set_data(G_OBJECT(menu_item), "chapter-id", g_strdup_printf("%i", chapter_id+1));
- gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->chapters_menu), menu_item);
- g_signal_connect (menu_item, "activate",
- G_CALLBACK (parole_player_chapter_selection_changed_cb), player);
+ gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->chapters_menu), menu_item);
+ g_signal_connect(menu_item, "activate",
+ G_CALLBACK(parole_player_chapter_selection_changed_cb), player);
}
}
static void
-parole_player_clear_subtitles (ParolePlayer *player)
+parole_player_clear_subtitles(ParolePlayer *player)
{
GtkTreeIter iter;
GList *menu_items, *menu_iter;
@@ -776,7 +776,7 @@ parole_player_clear_subtitles (ParolePlayer *player)
}
static void
-parole_player_set_subtitles_list (ParolePlayer *player, GList *subtitle_list)
+parole_player_set_subtitles_list(ParolePlayer *player, GList *subtitle_list)
{
GList *l;
gchar* language;
@@ -792,30 +792,30 @@ parole_player_set_subtitles_list (ParolePlayer *player, GList *subtitle_list)
for (l = subtitle_list; l != NULL; l = l->next)
{
- language = g_strdup (l->data);
+ language = g_strdup(l->data);
gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, language, -1);
- menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->subtitles_group), language);
- gtk_widget_show (menu_item);
+ menu_item = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(player->priv->subtitles_group), language);
+ gtk_widget_show(menu_item);
- gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->subtitles_menu), menu_item);
- g_signal_connect (menu_item, "activate",
- G_CALLBACK (parole_player_subtitles_radio_menu_item_changed_cb), player);
+ gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->subtitles_menu), menu_item);
+ g_signal_connect(menu_item, "activate",
+ G_CALLBACK(parole_player_subtitles_radio_menu_item_changed_cb), player);
- g_free (language);
+ g_free(language);
counter++;
}
- if (g_list_length (subtitle_list) != 1) {
+ if (g_list_length(subtitle_list) != 1) {
gtk_widget_show(player->priv->infobar);
}
}
static void
-parole_player_clear_audio_tracks (ParolePlayer *player)
+parole_player_clear_audio_tracks(ParolePlayer *player)
{
GList *menu_items, *menu_iter;
GtkWidget *empty_item;
@@ -835,11 +835,11 @@ parole_player_clear_audio_tracks (ParolePlayer *player)
gtk_widget_set_sensitive(empty_item, FALSE);
gtk_widget_show(empty_item);
- gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), empty_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->languages_menu), empty_item);
}
static void
-parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
+parole_player_set_audio_list(ParolePlayer *player, GList *audio_list)
{
GList *menu_iter;
GList *l;
@@ -851,7 +851,7 @@ parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
parole_player_clear_audio_tracks(player);
- menu_iter = gtk_container_get_children(GTK_CONTAINER (player->priv->languages_menu));
+ menu_iter = gtk_container_get_children(GTK_CONTAINER(player->priv->languages_menu));
gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
g_list_free(menu_iter);
@@ -860,34 +860,34 @@ parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
for (l = audio_list; l != NULL; l = l->next)
{
- language = g_strdup (l->data);
+ language = g_strdup(l->data);
gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter);
gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter, 0, language, -1);
if (player->priv->audio_group == NULL) {
- player->priv->audio_group = GTK_WIDGET (gtk_radio_menu_item_new_with_label (NULL, language));
- gtk_widget_show (GTK_WIDGET(player->priv->audio_group));
- gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), GTK_WIDGET(player->priv->audio_group));
+ player->priv->audio_group = GTK_WIDGET(gtk_radio_menu_item_new_with_label(NULL, language));
+ gtk_widget_show(GTK_WIDGET(player->priv->audio_group));
+ gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->languages_menu), GTK_WIDGET(player->priv->audio_group));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->audio_group), TRUE);
- g_signal_connect (player->priv->audio_group, "activate",
- G_CALLBACK (parole_player_audiotrack_radio_menu_item_changed_cb), player);
+ g_signal_connect(player->priv->audio_group, "activate",
+ G_CALLBACK(parole_player_audiotrack_radio_menu_item_changed_cb), player);
} else {
- menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->audio_group), language);
- gtk_widget_show (menu_item);
- gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), menu_item);
+ menu_item = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(player->priv->audio_group), language);
+ gtk_widget_show(menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->languages_menu), menu_item);
- g_signal_connect (menu_item, "activate",
- G_CALLBACK (parole_player_audiotrack_radio_menu_item_changed_cb), player);
+ g_signal_connect(menu_item, "activate",
+ G_CALLBACK(parole_player_audiotrack_radio_menu_item_changed_cb), player);
}
- g_free (language);
+ g_free(language);
}
gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack), 0);
- if (g_list_length (audio_list) >= 2) {
+ if (g_list_length(audio_list) >= 2) {
gtk_widget_set_sensitive(GTK_WIDGET(player->priv->combobox_audiotrack), TRUE);
gtk_widget_show(player->priv->infobar);
} else {
@@ -896,33 +896,33 @@ parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
}
static void
-parole_player_update_audio_tracks (ParolePlayer *player, ParoleGst *gst)
+parole_player_update_audio_tracks(ParolePlayer *player, ParoleGst *gst)
{
- GList * list = gst_get_lang_list_for_type (gst, "AUDIO");
+ GList * list = gst_get_lang_list_for_type(gst, "AUDIO");
if (parole_sublang_equal_lists (player->priv->audio_list, list) == TRUE)
{
return;
}
- parole_player_set_audio_list (player, list);
+ parole_player_set_audio_list(player, list);
- g_free (list->data);
- g_list_free (list);
+ g_free(list->data);
+ g_list_free(list);
list = NULL;
}
static void
-parole_player_update_subtitles (ParolePlayer *player, ParoleGst *gst)
+parole_player_update_subtitles(ParolePlayer *player, ParoleGst *gst)
{
- GList * list = gst_get_lang_list_for_type (gst, "TEXT");
+ GList * list = gst_get_lang_list_for_type(gst, "TEXT");
guint64 sub_index;
gboolean sub_enabled;
sub_index = 0;
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"enable-subtitle", &sub_enabled,
NULL);
@@ -938,20 +938,20 @@ parole_player_update_subtitles (ParolePlayer *player, ParoleGst *gst)
return;
}
- parole_player_set_subtitles_list (player, list);
+ parole_player_set_subtitles_list(player, list);
gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_subtitles), sub_index);
- if (g_list_length (list) != 1) {
+ if (g_list_length(list) != 1) {
gtk_widget_show(player->priv->infobar);
}
- g_free (list->data);
- g_list_free (list);
+ g_free(list->data);
+ g_list_free(list);
list = NULL;
}
static void
-parole_player_update_languages (ParolePlayer *player, ParoleGst *gst)
+parole_player_update_languages(ParolePlayer *player, ParoleGst *gst)
{
if (player->priv->update_languages == TRUE) {
if (gst_get_has_video(PAROLE_GST(player->priv->gst))) {
@@ -970,7 +970,7 @@ parole_player_update_languages (ParolePlayer *player, ParoleGst *gst)
}
static void
-parole_player_show_audiobox (ParolePlayer *player)
+parole_player_show_audiobox(ParolePlayer *player)
{
/* Only show the audiobox if we're sure there's no video playing and
visualizations are disabled. */
@@ -995,7 +995,7 @@ parole_player_show_audiobox (ParolePlayer *player)
* the subtitles selected.
**/
static void
-parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
+parole_player_select_custom_subtitle(GtkMenuItem *widget, gpointer data)
{
ParolePlayer *player;
ParoleFile *file;
@@ -1011,7 +1011,7 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
player = PAROLE_PLAYER(data);
/* Build the FileChooser dialog for subtitle selection. */
- chooser = gtk_file_chooser_dialog_new (_("Select Subtitle File"), NULL,
+ chooser = gtk_file_chooser_dialog_new(_("Select Subtitle File"), NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
NULL,
NULL);
@@ -1023,55 +1023,55 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
img = gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(button), img);
- gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), FALSE);
- gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(chooser), FALSE);
+ gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(chooser), FALSE);
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"media-chooser-folder", &folder,
NULL);
if ( folder )
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), folder);
+ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), folder);
/* Subtitle format filter */
- filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Subtitle Files"));
- gtk_file_filter_add_pattern (filter, "*.asc");
- gtk_file_filter_add_pattern (filter, "*.txt");
- gtk_file_filter_add_pattern (filter, "*.sub");
- gtk_file_filter_add_pattern (filter, "*.srt");
- gtk_file_filter_add_pattern (filter, "*.smi");
- gtk_file_filter_add_pattern (filter, "*.ssa");
- gtk_file_filter_add_pattern (filter, "*.ass");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+ filter = gtk_file_filter_new();
+ gtk_file_filter_set_name(filter, _("Subtitle Files"));
+ gtk_file_filter_add_pattern(filter, "*.asc");
+ gtk_file_filter_add_pattern(filter, "*.txt");
+ gtk_file_filter_add_pattern(filter, "*.sub");
+ gtk_file_filter_add_pattern(filter, "*.srt");
+ gtk_file_filter_add_pattern(filter, "*.smi");
+ gtk_file_filter_add_pattern(filter, "*.ssa");
+ gtk_file_filter_add_pattern(filter, "*.ass");
+ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
/* All files filter */
- all_files = gtk_file_filter_new ();
- gtk_file_filter_set_name (all_files, _("All files"));
- gtk_file_filter_add_pattern (all_files, "*");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), all_files);
+ all_files = gtk_file_filter_new();
+ gtk_file_filter_set_name(all_files, _("All files"));
+ gtk_file_filter_add_pattern(all_files, "*");
+ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), all_files);
- gtk_window_set_default_size (GTK_WINDOW (chooser), 680, 480);
+ gtk_window_set_default_size(GTK_WINDOW(chooser), 680, 480);
/* Run the dialog, get the selected filename. */
- response = gtk_dialog_run (GTK_DIALOG (chooser));
+ response = gtk_dialog_run(GTK_DIALOG(chooser));
if ( response == GTK_RESPONSE_OK )
- sub = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+ sub = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
- gtk_widget_destroy (chooser);
+ gtk_widget_destroy(chooser);
if ( sub )
{
/* Get the current playing file uri. */
- uri = parole_gst_get_file_uri(PAROLE_GST (player->priv->gst));
+ uri = parole_gst_get_file_uri(PAROLE_GST(player->priv->gst));
/* Reset the player. */
parole_player_reset(player);
if ( g_str_has_prefix (uri, "file:/") )
{
- TRACE ("Trying to play media file %s", uri);
- TRACE ("Trying to use subtitle file %s", sub);
+ TRACE("Trying to play media file %s", uri);
+ TRACE("Trying to use subtitle file %s", sub);
player->priv->updated_subs = TRUE;
file = parole_media_list_get_selected_file(player->priv->list);
@@ -1081,28 +1081,28 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
if ( file )
{
parole_file_set_custom_subtitles(file, sub);
- parole_gst_set_custom_subtitles(PAROLE_GST (player->priv->gst), sub);
- parole_gst_play_uri (PAROLE_GST (player->priv->gst), uri, sub);
+ parole_gst_set_custom_subtitles(PAROLE_GST(player->priv->gst), sub);
+ parole_gst_play_uri(PAROLE_GST(player->priv->gst), uri, sub);
}
}
- g_free (sub);
- g_free (uri);
+ g_free(sub);
+ g_free(uri);
}
}
static void
-parole_player_media_activated_cb (ParoleMediaList *list, GtkTreeRowReference *row, ParolePlayer *player)
+parole_player_media_activated_cb(ParoleMediaList *list, GtkTreeRowReference *row, ParolePlayer *player)
{
ParoleFile *file;
GtkTreeIter iter;
GtkTreeModel *model;
- model = gtk_tree_row_reference_get_model (row);
+ model = gtk_tree_row_reference_get_model(row);
if ( gtk_tree_model_get_iter (model, &iter, gtk_tree_row_reference_get_path (row)) )
{
- gtk_tree_model_get (model, &iter, DATA_COL, &file, -1);
+ gtk_tree_model_get(model, &iter, DATA_COL, &file, -1);
if ( file )
{
@@ -1111,112 +1111,112 @@ parole_player_media_activated_cb (ParoleMediaList *list, GtkTreeRowReference *ro
const gchar *directory = NULL;
gint dvd_chapter;
- uri = parole_file_get_uri (file);
+ uri = parole_file_get_uri(file);
directory = parole_file_get_directory(file);
if ( g_str_has_prefix (uri, "dvd") )
{
- parole_player_dvd_reset (player);
- player->priv->row = gtk_tree_row_reference_copy (row);
+ parole_player_dvd_reset(player);
+ player->priv->row = gtk_tree_row_reference_copy(row);
dvd_chapter = parole_file_get_dvd_chapter(file);
parole_gst_set_dvd_chapter(PAROLE_GST(player->priv->gst), dvd_chapter);
- g_object_unref (file);
+ g_object_unref(file);
return;
}
- parole_player_reset (player);
- player->priv->row = gtk_tree_row_reference_copy (row);
+ parole_player_reset(player);
+ player->priv->row = gtk_tree_row_reference_copy(row);
if ( g_str_has_prefix (uri, "file:/") )
{
if ( parole_file_filter (player->priv->video_filter, file) )
{
- sub = parole_file_get_custom_subtitles (file);
+ sub = parole_file_get_custom_subtitles(file);
parole_gst_set_custom_subtitles(PAROLE_GST(player->priv->gst), sub);
if (sub == NULL)
- sub = parole_get_subtitle_path (uri);
+ sub = parole_get_subtitle_path(uri);
}
}
- TRACE ("Trying to play media file %s", uri);
- TRACE ("File content type %s", parole_file_get_content_type(file));
+ TRACE("Trying to play media file %s", uri);
+ TRACE("File content type %s", parole_file_get_content_type(file));
- parole_gst_play_uri (PAROLE_GST (player->priv->gst),
- parole_file_get_uri (file),
+ parole_gst_play_uri(PAROLE_GST(player->priv->gst),
+ parole_file_get_uri(file),
sub);
- gtk_window_set_title (GTK_WINDOW (player->priv->window), parole_media_list_get_row_name (player->priv->list, player->priv->row));
+ gtk_window_set_title(GTK_WINDOW(player->priv->window), parole_media_list_get_row_name(player->priv->list, player->priv->row));
if ( directory )
{
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"media-chooser-folder", directory,
NULL);
}
- g_object_unref (file);
+ g_object_unref(file);
}
}
}
static void
-parole_player_disc_selected_cb (ParoleDisc *disc, const gchar *uri, const gchar *device, ParolePlayer *player)
+parole_player_disc_selected_cb(ParoleDisc *disc, const gchar *uri, const gchar *device, ParolePlayer *player)
{
- parole_player_reset (player);
- parole_gst_play_device_uri (PAROLE_GST (player->priv->gst), uri, device);
- player->priv->current_media_type = parole_gst_get_current_stream_type (PAROLE_GST (player->priv->gst));
+ parole_player_reset(player);
+ parole_gst_play_device_uri(PAROLE_GST(player->priv->gst), uri, device);
+ player->priv->current_media_type = parole_gst_get_current_stream_type(PAROLE_GST(player->priv->gst));
if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_CDDA ) {
player->priv->wait_for_gst_disc_info = TRUE;
if ( player->priv->row ) {
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
- gtk_tree_row_reference_free (player->priv->row);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
+ gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
}
TRACE("CLEAR PLAYLIST");
- parole_media_list_clear_list (player->priv->list);
+ parole_media_list_clear_list(player->priv->list);
TRACE("END CLEAR PLAYLIST");
} else if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ) {
parole_media_list_set_playlist_view(player->priv->list, PAROLE_MEDIA_LIST_PLAYLIST_VIEW_DISC);
gtk_widget_show(GTK_WIDGET(player->priv->dvd_menu));
- g_simple_action_set_enabled (player->priv->toggle_repeat_action, FALSE);
- g_simple_action_set_enabled (player->priv->toggle_shuffle_action, FALSE);
+ g_simple_action_set_enabled(player->priv->toggle_repeat_action, FALSE);
+ g_simple_action_set_enabled(player->priv->toggle_shuffle_action, FALSE);
}
}
static void
-parole_player_uri_opened_cb (ParoleMediaList *list, const gchar *uri, ParolePlayer *player)
+parole_player_uri_opened_cb(ParoleMediaList *list, const gchar *uri, ParolePlayer *player)
{
- parole_player_reset (player);
- parole_gst_play_uri (PAROLE_GST (player->priv->gst), uri, NULL);
+ parole_player_reset(player);
+ parole_gst_play_uri(PAROLE_GST(player->priv->gst), uri, NULL);
}
static void
-parole_player_iso_opened_cb (ParoleMediaList *list, const gchar *uri, ParolePlayer *player)
+parole_player_iso_opened_cb(ParoleMediaList *list, const gchar *uri, ParolePlayer *player)
{
- parole_player_reset (player);
- parole_player_disc_selected_cb (NULL, uri, NULL, player);
+ parole_player_reset(player);
+ parole_player_disc_selected_cb(NULL, uri, NULL, player);
}
static void
-parole_player_recent_menu_clear_activated_cb (GtkWidget *widget, ParolePlayer *player)
+parole_player_recent_menu_clear_activated_cb(GtkWidget *widget, ParolePlayer *player)
{
GtkWidget *dlg;
GtkWidget *clear_button;
gint response;
- dlg = gtk_message_dialog_new (GTK_WINDOW(player->priv->window),
+ dlg = gtk_message_dialog_new(GTK_WINDOW(player->priv->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
NULL);
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dlg),
+ gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dlg),
g_strdup_printf("<big><b>%s</b></big>",
_("Clear Recent Items")));
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dlg),
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dlg),
_("Are you sure you wish to clear your recent items history? This cannot be undone."));
- gtk_dialog_add_button (GTK_DIALOG(dlg), _("Cancel"), 0);
+ gtk_dialog_add_button(GTK_DIALOG(dlg), _("Cancel"), 0);
clear_button = gtk_dialog_add_button(GTK_DIALOG(dlg),
"edit-clear",
1);
@@ -1229,23 +1229,23 @@ parole_player_recent_menu_clear_activated_cb (GtkWidget *widget, ParolePlayer *p
{
GList *items, *l;
- items = gtk_recent_manager_get_items (player->priv->recent);
+ items = gtk_recent_manager_get_items(player->priv->recent);
for (l = items; l != NULL; l = l->next) {
GtkRecentInfo *info = l->data;
if (gtk_recent_info_has_application(info, "parole"))
- gtk_recent_manager_remove_item (player->priv->recent,
+ gtk_recent_manager_remove_item(player->priv->recent,
gtk_recent_info_get_uri(info),
NULL);
}
- g_list_free_full (items, (GDestroyNotify) gtk_recent_info_unref);
+ g_list_free_full(items, (GDestroyNotify)gtk_recent_info_unref);
}
gtk_widget_destroy(dlg);
}
static void
-parole_player_recent_menu_item_activated_cb (GtkWidget *widget, ParolePlayer *player)
+parole_player_recent_menu_item_activated_cb(GtkWidget *widget, ParolePlayer *player)
{
gchar *uri;
gchar *filename;
@@ -1258,12 +1258,12 @@ parole_player_recent_menu_item_activated_cb (GtkWidget *widget, ParolePlayer *pl
if (g_file_test (filename, G_FILE_TEST_EXISTS))
{
- gtk_recent_manager_add_item (player->priv->recent, uri);
+ gtk_recent_manager_add_item(player->priv->recent, uri);
filenames[0] = g_strdup(filename);
- list = parole_player_get_media_list (player);
- parole_media_list_add_files (list, filenames, FALSE);
+ list = parole_player_get_media_list(player);
+ parole_media_list_add_files(list, filenames, FALSE);
g_free(filenames[0]);
}
@@ -1273,64 +1273,64 @@ parole_player_recent_menu_item_activated_cb (GtkWidget *widget, ParolePlayer *pl
}
static void
-parole_player_media_cursor_changed_cb (ParoleMediaList *list, gboolean media_selected, ParolePlayer *player)
+parole_player_media_cursor_changed_cb(ParoleMediaList *list, gboolean media_selected, ParolePlayer *player)
{
gboolean enabled;
/* Play/Pause */
if (player->priv->state < PAROLE_STATE_PAUSED)
{
- g_simple_action_set_enabled (player->priv->media_playpause_action,
- media_selected || !parole_media_list_is_empty (player->priv->list));
+ g_simple_action_set_enabled(player->priv->media_playpause_action,
+ media_selected || !parole_media_list_is_empty(player->priv->list));
}
- enabled = parole_media_list_get_playlist_count (player->priv->list) > 1;
+ enabled = parole_media_list_get_playlist_count(player->priv->list) > 1;
/* Previous */
- gtk_widget_set_sensitive (player->priv->previous_button, enabled);
- g_simple_action_set_enabled (player->priv->media_previous_action, enabled);
+ gtk_widget_set_sensitive(player->priv->previous_button, enabled);
+ g_simple_action_set_enabled(player->priv->media_previous_action, enabled);
/* Next */
- gtk_widget_set_sensitive (player->priv->next_button, enabled);
- g_simple_action_set_enabled (player->priv->media_next_action, enabled);
+ gtk_widget_set_sensitive(player->priv->next_button, enabled);
+ g_simple_action_set_enabled(player->priv->media_next_action, enabled);
}
static void
-parole_player_media_list_show_playlist_cb (ParoleMediaList *list, gboolean show_playlist, ParolePlayer *player)
+parole_player_media_list_show_playlist_cb(ParoleMediaList *list, gboolean show_playlist, ParolePlayer *player)
{
parole_media_list_set_playlist_view(player->priv->list,
player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD);
- parole_player_set_playlist_visible (player, show_playlist);
+ parole_player_set_playlist_visible(player, show_playlist);
}
static void
-parole_player_media_progressed_cb (ParoleGst *gst, const ParoleStream *stream, gint64 value, ParolePlayer *player)
+parole_player_media_progressed_cb(ParoleGst *gst, const ParoleStream *stream, gint64 value, ParolePlayer *player)
{
#ifdef DEBUG
- g_return_if_fail (value > 0);
+ g_return_if_fail(value > 0);
#endif
if (!player->priv->user_seeking)
{
- parole_player_change_range_value (player, value);
+ parole_player_change_range_value(player, value);
}
}
static void
-parole_player_seekable_notify (ParoleStream *stream, GParamSpec *spec, ParolePlayer *player)
+parole_player_seekable_notify(ParoleStream *stream, GParamSpec *spec, ParolePlayer *player)
{
gboolean seekable;
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"seekable", &seekable,
NULL);
- gtk_widget_set_tooltip_text (GTK_WIDGET (player->priv->range), seekable ? NULL : _("Media stream is not seekable"));
- gtk_widget_set_sensitive (GTK_WIDGET (player->priv->range), seekable);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->range), seekable ? NULL : _("Media stream is not seekable"));
+ gtk_widget_set_sensitive(GTK_WIDGET(player->priv->range), seekable);
}
static void
-parole_player_set_playpause_button_from_stock (ParolePlayer *player, const gchar *stock_id)
+parole_player_set_playpause_button_from_stock(ParolePlayer *player, const gchar *stock_id)
{
gchar *icon_name = NULL, *tooltip = NULL;
@@ -1347,7 +1347,7 @@ parole_player_set_playpause_button_from_stock (ParolePlayer *player, const gchar
}
static void
-parole_player_save_uri (ParolePlayer *player, const ParoleStream *stream)
+parole_player_save_uri(ParolePlayer *player, const ParoleStream *stream)
{
ParoleMediaType media_type;
gchar *uri;
@@ -1355,21 +1355,21 @@ parole_player_save_uri (ParolePlayer *player, const ParoleStream *stream)
gchar **lines = NULL;
guint i;
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"uri", &uri,
NULL);
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"media-type", &media_type,
NULL);
if ( media_type == PAROLE_MEDIA_TYPE_LOCAL_FILE )
{
- gtk_recent_manager_add_item (player->priv->recent, uri);
+ gtk_recent_manager_add_item(player->priv->recent, uri);
goto out;
}
- lines = parole_get_history ();
+ lines = parole_get_history();
if (lines )
{
@@ -1387,17 +1387,17 @@ parole_player_save_uri (ParolePlayer *player, const ParoleStream *stream)
{
if ( save )
{
- parole_insert_line_history (uri);
+ parole_insert_line_history(uri);
}
}
- g_strfreev (lines);
+ g_strfreev(lines);
out:
- g_free (uri);
+ g_free(uri);
}
static void
-parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
+parole_player_playing(ParolePlayer *player, const ParoleStream *stream)
{
gint64 duration;
gboolean seekable;
@@ -1408,9 +1408,9 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
gtk_widget_set_sensitive(player->priv->playpause_button, TRUE);
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PLAYING);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PLAYING);
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"seekable", &seekable,
"duration", &duration,
"video-width", &width,
@@ -1420,28 +1420,28 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
#ifdef HAVE_CLUTTER
if (player->priv->use_clutter)
- parole_clutter_set_video_dimensions (PAROLE_CLUTTER(player->priv->clutter), width, height);
+ parole_clutter_set_video_dimensions(PAROLE_CLUTTER(player->priv->clutter), width, height);
#endif
if (player->priv->wait_for_gst_disc_info == TRUE) {
- parole_media_list_add_cdda_tracks(player->priv->list, parole_gst_get_num_tracks(PAROLE_GST (player->priv->gst)));
+ parole_media_list_add_cdda_tracks(player->priv->list, parole_gst_get_num_tracks(PAROLE_GST(player->priv->gst)));
player->priv->wait_for_gst_disc_info = FALSE;
}
- g_simple_action_set_enabled (player->priv->media_playpause_action, TRUE);
+ g_simple_action_set_enabled(player->priv->media_playpause_action, TRUE);
- parole_player_set_playpause_button_from_stock (player, "gtk-media-pause");
+ parole_player_set_playpause_button_from_stock(player, "gtk-media-pause");
- gtk_widget_set_sensitive (player->priv->range, seekable);
+ gtk_widget_set_sensitive(player->priv->range, seekable);
player->priv->internal_range_change = TRUE;
if (live || duration == 0) {
- parole_player_change_range_value (player, 0);
+ parole_player_change_range_value(player, 0);
gtk_widget_set_visible(player->priv->label_duration, FALSE);
gtk_widget_set_visible(player->priv->label_divider, FALSE);
gtk_widget_set_visible(player->priv->label_elapsed, FALSE);
} else {
- gtk_range_set_range (GTK_RANGE (player->priv->range), 0, duration);
+ gtk_range_set_range(GTK_RANGE(player->priv->range), 0, duration);
gtk_widget_set_visible(player->priv->label_duration, TRUE);
gtk_widget_set_visible(player->priv->label_divider, TRUE);
gtk_widget_set_visible(player->priv->label_elapsed, TRUE);
@@ -1449,11 +1449,11 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
if (duration != 0) {
gchar dur_text[128];
- get_time_string (dur_text, duration);
+ get_time_string(dur_text, duration);
- gtk_label_set_text (GTK_LABEL (player->priv->label_duration), dur_text);
+ gtk_label_set_text(GTK_LABEL(player->priv->label_duration), dur_text);
if ( player->priv->current_media_type != PAROLE_MEDIA_TYPE_DVD ) {
- parole_media_list_set_row_length (player->priv->list,
+ parole_media_list_set_row_length(player->priv->list,
player->priv->row,
dur_text);
}
@@ -1461,231 +1461,231 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
player->priv->internal_range_change = FALSE;
- gtk_widget_set_tooltip_text (GTK_WIDGET (player->priv->range), seekable ? NULL : _("Media stream is not seekable"));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->range), seekable ? NULL : _("Media stream is not seekable"));
- parole_player_save_uri (player, stream);
- parole_media_list_select_row (player->priv->list, player->priv->row);
- gtk_widget_grab_focus (player->priv->gst);
- parole_player_update_languages (player, PAROLE_GST(player->priv->gst));
+ parole_player_save_uri(player, stream);
+ parole_media_list_select_row(player->priv->list, player->priv->row);
+ gtk_widget_grab_focus(player->priv->gst);
+ parole_player_update_languages(player, PAROLE_GST(player->priv->gst));
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"hide-controls-timeout", &hide_controls_timeout,
NULL);
if (hide_controls_timeout != 0 || player->priv->full_screen)
{
if (player->priv->full_screen)
- g_timeout_add_seconds (4, (GSourceFunc) parole_player_hide_controls, player);
+ g_timeout_add_seconds(4, (GSourceFunc)parole_player_hide_controls, player);
else
- g_timeout_add_seconds (hide_controls_timeout, (GSourceFunc) parole_player_hide_controls, player);
+ g_timeout_add_seconds(hide_controls_timeout, (GSourceFunc)parole_player_hide_controls, player);
}
}
static void
-parole_player_paused (ParolePlayer *player)
+parole_player_paused(ParolePlayer *player)
{
- TRACE ("Player paused");
+ TRACE("Player paused");
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PAUSED);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PAUSED);
- g_simple_action_set_enabled (player->priv->media_playpause_action, TRUE);
+ g_simple_action_set_enabled(player->priv->media_playpause_action, TRUE);
if ( player->priv->user_seeking == FALSE)
{
- parole_player_set_playpause_button_from_stock (player, "gtk-media-play");
+ parole_player_set_playpause_button_from_stock(player, "gtk-media-play");
}
}
static void
-parole_player_quit (ParolePlayer *player)
+parole_player_quit(ParolePlayer *player)
{
- parole_media_list_save_list (player->priv->list);
- parole_gst_shutdown (PAROLE_GST (player->priv->gst));
- gtk_widget_destroy (player->priv->window);
- g_object_unref (player);
- gtk_main_quit ();
+ parole_media_list_save_list(player->priv->list);
+ parole_gst_shutdown(PAROLE_GST(player->priv->gst));
+ gtk_widget_destroy(player->priv->window);
+ g_object_unref(player);
+ gtk_main_quit();
}
static void
-parole_player_stopped (ParolePlayer *player)
+parole_player_stopped(ParolePlayer *player)
{
GdkPixbuf *logo;
gchar dur_text[128];
- TRACE ("Player stopped");
+ TRACE("Player stopped");
- g_simple_action_set_enabled (player->priv->media_playpause_action,
- parole_media_list_is_selected_row (player->priv->list) ||
- !parole_media_list_is_empty (player->priv->list));
+ g_simple_action_set_enabled(player->priv->media_playpause_action,
+ parole_media_list_is_selected_row(player->priv->list) ||
+ !parole_media_list_is_empty(player->priv->list));
- gtk_window_set_title (GTK_WINDOW (player->priv->window), _("Parole Media Player"));
+ gtk_window_set_title(GTK_WINDOW(player->priv->window), _("Parole Media Player"));
gtk_widget_hide(player->priv->videobox);
gtk_widget_hide(player->priv->audiobox);
- logo = gdk_pixbuf_new_from_file (g_strdup_printf ("%s/replay.png", PIXMAPS_DIR), NULL);
+ logo = gdk_pixbuf_new_from_file(g_strdup_printf("%s/replay.png", PIXMAPS_DIR), NULL);
gtk_image_set_from_pixbuf(GTK_IMAGE(player->priv->logo_image), logo);
gtk_widget_show(player->priv->logo_image);
- get_time_string (dur_text, 0);
- gtk_label_set_text (GTK_LABEL (player->priv->label_duration), dur_text);
+ get_time_string(dur_text, 0);
+ gtk_label_set_text(GTK_LABEL(player->priv->label_duration), dur_text);
- parole_player_change_range_value (player, 0);
- gtk_widget_set_sensitive (player->priv->range, FALSE);
+ parole_player_change_range_value(player, 0);
+ gtk_widget_set_sensitive(player->priv->range, FALSE);
- parole_player_set_playpause_button_from_stock (player, "gtk-media-play");
+ parole_player_set_playpause_button_from_stock(player, "gtk-media-play");
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
if ( player->priv->exit )
{
- parole_player_quit (player);
+ parole_player_quit(player);
}
}
static void
-parole_player_play_selected_row (ParolePlayer *player)
+parole_player_play_selected_row(ParolePlayer *player)
{
GtkTreeRowReference *row;
- row = parole_media_list_get_selected_row (player->priv->list);
+ row = parole_media_list_get_selected_row(player->priv->list);
if ( row == NULL )
- row = parole_media_list_get_first_row (player->priv->list);
+ row = parole_media_list_get_first_row(player->priv->list);
if ( row )
- parole_player_media_activated_cb (player->priv->list, row, player);
+ parole_player_media_activated_cb(player->priv->list, row, player);
}
static void
-parole_player_play_next (ParolePlayer *player, gboolean allow_shuffle)
+parole_player_play_next(ParolePlayer *player, gboolean allow_shuffle)
{
gboolean repeat, shuffle;
GtkTreeRowReference *row;
if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ) {
- parole_gst_next_dvd_chapter (PAROLE_GST(player->priv->gst));
+ parole_gst_next_dvd_chapter(PAROLE_GST(player->priv->gst));
return;
}
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"shuffle", &shuffle,
"repeat", &repeat,
NULL);
if ( player->priv->row ) {
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
if ( shuffle && allow_shuffle )
- row = parole_media_list_get_row_random (player->priv->list);
+ row = parole_media_list_get_row_random(player->priv->list);
else
- row = parole_media_list_get_next_row (player->priv->list, player->priv->row, repeat);
+ row = parole_media_list_get_next_row(player->priv->list, player->priv->row, repeat);
if ( row ) {
- parole_player_media_activated_cb (player->priv->list, row, player);
+ parole_player_media_activated_cb(player->priv->list, row, player);
return;
} else {
- TRACE ("No remaining media in the list");
- gtk_tree_row_reference_free (player->priv->row);
+ TRACE("No remaining media in the list");
+ gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
}
}
- parole_gst_stop (PAROLE_GST (player->priv->gst));
+ parole_gst_stop(PAROLE_GST(player->priv->gst));
}
static void
-parole_player_play_prev (ParolePlayer *player)
+parole_player_play_prev(ParolePlayer *player)
{
GtkTreeRowReference *row;
if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ) {
- parole_gst_prev_dvd_chapter (PAROLE_GST(player->priv->gst));
+ parole_gst_prev_dvd_chapter(PAROLE_GST(player->priv->gst));
return;
}
if ( player->priv->row ) {
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
- row = parole_media_list_get_prev_row (player->priv->list, player->priv->row);
+ row = parole_media_list_get_prev_row(player->priv->list, player->priv->row);
if ( row ) {
- parole_player_media_activated_cb (player->priv->list, row, player);
+ parole_player_media_activated_cb(player->priv->list, row, player);
return;
} else {
- TRACE ("No remaining media in the list");
- gtk_tree_row_reference_free (player->priv->row);
+ TRACE("No remaining media in the list");
+ gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
}
}
- parole_gst_stop (PAROLE_GST (player->priv->gst));
+ parole_gst_stop(PAROLE_GST(player->priv->gst));
}
static void
-parole_player_reset_saver_changed (ParolePlayer *player, const ParoleStream *stream)
+parole_player_reset_saver_changed(ParolePlayer *player, const ParoleStream *stream)
{
gboolean reset_saver;
- TRACE ("Start");
+ TRACE("Start");
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"reset-saver", &reset_saver,
NULL);
if ( !reset_saver ) {
- parole_screen_saver_uninhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
+ parole_screen_saver_uninhibit(player->priv->screen_saver, GTK_WINDOW(player->priv->window));
} else if ( player->priv->state == PAROLE_STATE_PLAYING ) {
gboolean has_video;
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"has-video", &has_video,
NULL);
if ( has_video ) {
- parole_screen_saver_inhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
+ parole_screen_saver_inhibit(player->priv->screen_saver, GTK_WINDOW(player->priv->window));
}
} else {
- parole_screen_saver_uninhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
+ parole_screen_saver_uninhibit(player->priv->screen_saver, GTK_WINDOW(player->priv->window));
}
}
static void
-parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, ParoleState state, ParolePlayer *player)
+parole_player_media_state_cb(ParoleGst *gst, const ParoleStream *stream, ParoleState state, ParolePlayer *player)
{
- PAROLE_DEBUG_ENUM ("State callback", state, PAROLE_ENUM_TYPE_STATE);
+ PAROLE_DEBUG_ENUM("State callback", state, PAROLE_ENUM_TYPE_STATE);
player->priv->state = state;
- parole_player_reset_saver_changed (player, stream);
+ parole_player_reset_saver_changed(player, stream);
if ( state == PAROLE_STATE_PLAYING ) {
- parole_player_playing (player, stream);
+ parole_player_playing(player, stream);
parole_player_show_audiobox(player);
} else if ( state == PAROLE_STATE_PAUSED ) {
- parole_player_paused (player);
+ parole_player_paused(player);
} else if ( state == PAROLE_STATE_STOPPED ) {
- parole_player_stopped (player);
+ parole_player_stopped(player);
/* PAROLE_STATE_ABOUT_TO_FINISH is used for continuous playback of audio CDs */
} else if ( state == PAROLE_STATE_ABOUT_TO_FINISH ) {
#ifdef DEBUG
- TRACE ("***Playback about to finish***");
+ TRACE("***Playback about to finish***");
#endif
if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
- parole_player_play_next (player, TRUE);
+ parole_player_play_next(player, TRUE);
} else if ( state == PAROLE_STATE_PLAYBACK_FINISHED ) {
#ifdef DEBUG
- TRACE ("***Playback finished***");
+ TRACE("***Playback finished***");
#endif
- parole_player_play_next (player, TRUE);
+ parole_player_play_next(player, TRUE);
}
}
static void
-on_infobar_close_clicked (GtkButton *button, ParolePlayer *player)
+on_infobar_close_clicked(GtkButton *button, ParolePlayer *player)
{
gtk_widget_hide(player->priv->infobar);
}
static void
-parole_player_repeat_state_changed (GSimpleAction *simple, GVariant *value, ParolePlayer *player)
+parole_player_repeat_state_changed(GSimpleAction *simple, GVariant *value, ParolePlayer *player)
{
gboolean active = g_simple_toggle_action_get_active(simple);
block_playlist_updates = TRUE;
@@ -1699,7 +1699,7 @@ parole_player_repeat_state_changed (GSimpleAction *simple, GVariant *value, Paro
}
static void
-parole_player_shuffle_state_changed (GSimpleAction *simple, GVariant *value, ParolePlayer *player)
+parole_player_shuffle_state_changed(GSimpleAction *simple, GVariant *value, ParolePlayer *player)
{
gboolean active = g_simple_toggle_action_get_active(simple);
block_playlist_updates = TRUE;
@@ -1713,36 +1713,36 @@ parole_player_shuffle_state_changed (GSimpleAction *simple, GVariant *value, Par
}
static void
-parole_player_toggle_playpause (ParolePlayer *player)
+parole_player_toggle_playpause(ParolePlayer *player)
{
if ( player->priv->state == PAROLE_STATE_PLAYING )
- parole_gst_pause (PAROLE_GST (player->priv->gst));
+ parole_gst_pause(PAROLE_GST(player->priv->gst));
else if ( player->priv->state == PAROLE_STATE_PAUSED )
- parole_gst_resume (PAROLE_GST (player->priv->gst));
+ parole_gst_resume(PAROLE_GST(player->priv->gst));
else
- parole_player_play_selected_row (player);
+ parole_player_play_selected_row(player);
}
void
-parole_player_playpause_action_cb (GSimpleAction *action)
+parole_player_playpause_action_cb(GSimpleAction *action)
{
- parole_player_toggle_playpause (parole_player);
+ parole_player_toggle_playpause(parole_player);
}
void
-parole_player_pause_clicked (GtkButton *button, ParolePlayer *player)
+parole_player_pause_clicked(GtkButton *button, ParolePlayer *player)
{
- parole_gst_pause (PAROLE_GST (player->priv->gst));
+ parole_gst_pause(PAROLE_GST(player->priv->gst));
}
-void parole_player_next_action_cb (GSimpleAction *action)
+void parole_player_next_action_cb(GSimpleAction *action)
{
- parole_player_play_next (parole_player, TRUE);
+ parole_player_play_next(parole_player, TRUE);
}
-void parole_player_previous_action_cb (GSimpleAction *action)
+void parole_player_previous_action_cb(GSimpleAction *action)
{
- parole_player_play_prev (parole_player);
+ parole_player_play_prev(parole_player);
}
GSimpleAction *parole_player_get_action(ParolePlayerAction action)
@@ -1763,23 +1763,23 @@ GSimpleAction *parole_player_get_action(ParolePlayerAction action)
}
}
-void parole_player_seekf_cb (GtkWidget *widget, ParolePlayer *player, gdouble seek)
+void parole_player_seekf_cb(GtkWidget *widget, ParolePlayer *player, gdouble seek)
{
- seek = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) ) + seek;
- parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
- parole_player_change_range_value (player, seek);
+ seek = parole_gst_get_stream_position(PAROLE_GST(player->priv->gst) ) + seek;
+ parole_gst_seek(PAROLE_GST(player->priv->gst), seek);
+ parole_player_change_range_value(player, seek);
}
-void parole_player_seekb_cb (GtkWidget *widget, ParolePlayer *player, gdouble seek)
+void parole_player_seekb_cb(GtkWidget *widget, ParolePlayer *player, gdouble seek)
{
- seek = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) ) - seek;
+ seek = parole_gst_get_stream_position(PAROLE_GST(player->priv->gst) ) - seek;
if ( seek < 0 ) { seek = 0; }
- parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
- parole_player_change_range_value (player, seek);
+ parole_gst_seek(PAROLE_GST(player->priv->gst), seek);
+ parole_player_change_range_value(player, seek);
}
gboolean
-parole_player_range_button_release (GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
+parole_player_range_button_release(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
{
ev->button = 2;
@@ -1789,7 +1789,7 @@ parole_player_range_button_release (GtkWidget *widget, GdkEventButton *ev, Parol
}
gboolean
-parole_player_range_button_press (GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
+parole_player_range_button_press(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
{
ev->button = 2;
@@ -1799,30 +1799,30 @@ parole_player_range_button_press (GtkWidget *widget, GdkEventButton *ev, ParoleP
}
void
-parole_player_range_value_changed (GtkRange *range, ParolePlayer *player)
+parole_player_range_value_changed(GtkRange *range, ParolePlayer *player)
{
gdouble value;
if ( !player->priv->internal_range_change )
{
- value = gtk_range_get_value (GTK_RANGE (range));
+ value = gtk_range_get_value(GTK_RANGE(range));
player->priv->user_seeking = TRUE;
- TRACE ("Sending a seek request with value :%e", value);
- parole_gst_seek (PAROLE_GST (player->priv->gst), value);
+ TRACE("Sending a seek request with value :%e", value);
+ parole_gst_seek(PAROLE_GST(player->priv->gst), value);
player->priv->user_seeking = FALSE;
}
}
static void
-parole_player_error_cb (ParoleGst *gst, const gchar *error, ParolePlayer *player)
+parole_player_error_cb(ParoleGst *gst, const gchar *error, ParolePlayer *player)
{
- parole_dialog_error (GTK_WINDOW (player->priv->window), _("GStreamer backend error"), error);
- parole_screen_saver_uninhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
- parole_player_stopped (player);
+ parole_dialog_error(GTK_WINDOW(player->priv->window), _("GStreamer backend error"), error);
+ parole_screen_saver_uninhibit(player->priv->screen_saver, GTK_WINDOW(player->priv->window));
+ parole_player_stopped(player);
}
static gchar *
-parole_player_get_filename_from_uri (gchar *uri)
+parole_player_get_filename_from_uri(gchar *uri)
{
gchar *filename = NULL;
gchar *scheme;
@@ -1832,30 +1832,30 @@ parole_player_get_filename_from_uri (gchar *uri)
GRegex *regex;
GMatchInfo *match_info;
- regex = g_regex_new ("^.*://.*/(?<filename>[^?#/]+)", 0, 0, NULL);
- g_regex_match (regex, uri, 0, &match_info);
+ regex = g_regex_new("^.*://.*/(?<filename>[^?#/]+)", 0, 0, NULL);
+ g_regex_match(regex, uri, 0, &match_info);
if (g_match_info_matches (match_info))
{
- gchar *word = g_match_info_fetch_named (match_info, "filename");
+ gchar *word = g_match_info_fetch_named(match_info, "filename");
filename = g_strdup(word);
- g_free (word);
+ g_free(word);
}
- g_match_info_free (match_info);
- g_regex_unref (regex);
+ g_match_info_free(match_info);
+ g_regex_unref(regex);
} else {
gchar *decoded;
decoded = g_filename_from_uri(uri, NULL, NULL);
filename = g_path_get_basename(decoded);
- g_free (decoded);
+ g_free(decoded);
}
- g_free (scheme);
+ g_free(scheme);
return filename;
}
static void
-parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePlayer *player)
+parole_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePlayer *player)
{
gchar *title;
gchar *album;
@@ -1866,7 +1866,7 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
GdkPixbuf *image = NULL;
if ( player->priv->row ) {
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"title", &title,
"album", &album,
"artist", &artist,
@@ -1875,19 +1875,19 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
NULL);
if ( title ) {
- parole_media_list_set_row_name (player->priv->list, player->priv->row, title);
- gtk_window_set_title (GTK_WINDOW (player->priv->window), title);
+ parole_media_list_set_row_name(player->priv->list, player->priv->row, title);
+ gtk_window_set_title(GTK_WINDOW(player->priv->window), title);
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", title));
- g_free (title);
+ g_free(title);
} else {
/* No ID3, no problem! Show the filename instead */
- filename = parole_player_get_filename_from_uri (uri);
+ filename = parole_player_get_filename_from_uri(uri);
if ( filename ) {
- gtk_window_set_title (GTK_WINDOW (player->priv->window), filename);
+ gtk_window_set_title(GTK_WINDOW(player->priv->window), filename);
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", filename));
- g_free (filename);
+ g_free(filename);
} else {
- gtk_window_set_title (GTK_WINDOW (player->priv->window), _("Parole Media Player"));
+ gtk_window_set_title(GTK_WINDOW(player->priv->window), _("Parole Media Player"));
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", _("Unknown Song")));
}
}
@@ -1899,17 +1899,17 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
else
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), album));
- g_free (album);
+ g_free(album);
} else {
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), _("Unknown Album")));
}
if (year)
- g_free (year);
+ g_free(year);
if ( artist ) {
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), artist));
- g_free (artist);
+ g_free(artist);
} else {
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), _("Unknown Artist")));
}
@@ -1925,80 +1925,80 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
}
static void
-parole_player_buffering_cb (ParoleGst *gst, const ParoleStream *stream, gint percentage, ParolePlayer *player)
+parole_player_buffering_cb(ParoleGst *gst, const ParoleStream *stream, gint percentage, ParolePlayer *player)
{
gchar *buff;
if ( percentage == 100 ) {
player->priv->buffering = FALSE;
- parole_gst_resume (PAROLE_GST (player->priv->gst));
- gtk_widget_hide (player->priv->progressbar_buffering);
- gtk_widget_show (player->priv->label_duration);
+ parole_gst_resume(PAROLE_GST(player->priv->gst));
+ gtk_widget_hide(player->priv->progressbar_buffering);
+ gtk_widget_show(player->priv->label_duration);
if ( player->priv->mini_mode )
- gtk_widget_show (player->priv->label_divider);
+ gtk_widget_show(player->priv->label_divider);
else
- gtk_widget_show (player->priv->range);
- gtk_widget_show (player->priv->label_elapsed);
+ gtk_widget_show(player->priv->range);
+ gtk_widget_show(player->priv->label_elapsed);
} else {
player->priv->buffering = TRUE;
if ( player->priv->state == PAROLE_STATE_PLAYING )
- parole_gst_pause (PAROLE_GST (player->priv->gst));
-
- buff = g_strdup_printf ("%s (%d%%)", _("Buffering"), percentage);
-
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), buff);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), (gdouble) percentage/100);
- gtk_widget_hide (player->priv->label_duration);
- gtk_widget_hide (player->priv->label_divider);
- gtk_widget_hide (player->priv->range);
- gtk_widget_hide (player->priv->label_elapsed);
- gtk_widget_show (player->priv->progressbar_buffering);
- g_free (buff);
+ parole_gst_pause(PAROLE_GST(player->priv->gst));
+
+ buff = g_strdup_printf("%s(%d%%)", _("Buffering"), percentage);
+
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(player->priv->progressbar_buffering), buff);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(player->priv->progressbar_buffering), (gdouble)percentage / 100);
+ gtk_widget_hide(player->priv->label_duration);
+ gtk_widget_hide(player->priv->label_divider);
+ gtk_widget_hide(player->priv->range);
+ gtk_widget_hide(player->priv->label_elapsed);
+ gtk_widget_show(player->priv->progressbar_buffering);
+ g_free(buff);
}
}
static void
-parole_player_dvd_chapter_count_change_cb (ParoleGst *gst, gint chapter_count, ParolePlayer *player)
+parole_player_dvd_chapter_count_change_cb(ParoleGst *gst, gint chapter_count, ParolePlayer *player)
{
- gtk_tree_row_reference_free (player->priv->row);
+ gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
/* FIXME Cannot clear list prior to adding new chapters. */
// parole_media_list_clear_list (player->priv->list);
- parole_media_list_add_dvd_chapters (player->priv->list, chapter_count);
+ parole_media_list_add_dvd_chapters(player->priv->list, chapter_count);
parole_player_update_chapters(player, chapter_count);
}
static void
-parole_player_dvd_chapter_change_cb (ParoleGst *gst, gint chapter_count, ParolePlayer *player)
+parole_player_dvd_chapter_change_cb(ParoleGst *gst, gint chapter_count, ParolePlayer *player)
{
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
- player->priv->row = parole_media_list_get_row_n (player->priv->list, chapter_count-1);
+ player->priv->row = parole_media_list_get_row_n(player->priv->list, chapter_count-1);
- parole_media_list_set_row_playback_state (player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PLAYING);
- parole_media_list_select_row (player->priv->list, player->priv->row);
+ parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PLAYING);
+ parole_media_list_select_row(player->priv->list, player->priv->row);
}
-gboolean parole_player_delete_event_cb (GtkWidget *widget, GdkEvent *ev, ParolePlayer *player)
+gboolean parole_player_delete_event_cb(GtkWidget *widget, GdkEvent *ev, ParolePlayer *player)
{
- parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (player->priv->window)));
+ parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(player->priv->window)));
player->priv->exit = TRUE;
- parole_gst_terminate (PAROLE_GST (player->priv->gst));
+ parole_gst_terminate(PAROLE_GST(player->priv->gst));
return TRUE;
}
void
-parole_player_destroy_cb (GObject *window, ParolePlayer *player)
+parole_player_destroy_cb(GObject *window, ParolePlayer *player)
{
}
gboolean
-parole_player_window_state_event (GtkWidget *widget,
+parole_player_window_state_event(GtkWidget *widget,
GdkEventWindowState *event,
ParolePlayer *player)
{
@@ -2006,13 +2006,13 @@ parole_player_window_state_event (GtkWidget *widget,
if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) {
/* Restore the previously saved window size if maximized */
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"window-width", player->priv->last_w,
"window-height", player->priv->last_h,
"window-maximized", TRUE,
NULL);
} else {
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"window-maximized", FALSE,
NULL);
}
@@ -2034,7 +2034,7 @@ parole_player_window_state_event (GtkWidget *widget,
* Reset the player controls based on existing conditions.
**/
void
-parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen)
+parole_player_reset_controls(ParolePlayer *player, gboolean fullscreen)
{
static gint current_page = 0;
@@ -2043,7 +2043,7 @@ parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen)
gint h, w;
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"always-hide-menubar", &always_hide_menubar,
"window-height", &h,
"window-width", &w,
@@ -2054,83 +2054,83 @@ parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen)
if ( player->priv->full_screen )
{
if (player->priv->show_menubar == TRUE)
- gtk_widget_show (player->priv->menu_bar);
+ gtk_widget_show(player->priv->menu_bar);
else if (always_hide_menubar == TRUE)
- gtk_widget_hide (player->priv->menu_bar);
+ gtk_widget_hide(player->priv->menu_bar);
- show_playlist = g_simple_toggle_action_get_active (player->priv->toggle_playlist_action);
- gtk_widget_show (player->priv->playlist_nt);
+ show_playlist = g_simple_toggle_action_get_active(player->priv->toggle_playlist_action);
+ gtk_widget_show(player->priv->playlist_nt);
parole_player_set_playlist_visible(player, show_playlist);
- gtk_menu_item_set_label (GTK_MENU_ITEM(player->priv->fullscreen_menu_item), _("_Fullscreen"));
- gtk_widget_set_tooltip_text (player->priv->fullscreen_button, _("Fullscreen"));
- gtk_image_set_from_icon_name (GTK_IMAGE(player->priv->fullscreen_image), "view-fullscreen-symbolic", 24);
- gtk_widget_set_visible (GTK_WIDGET(player->priv->showhide_playlist_button), TRUE);
+ gtk_menu_item_set_label(GTK_MENU_ITEM(player->priv->fullscreen_menu_item), _("_Fullscreen"));
+ gtk_widget_set_tooltip_text(player->priv->fullscreen_button, _("Fullscreen"));
+ gtk_image_set_from_icon_name(GTK_IMAGE(player->priv->fullscreen_image), "view-fullscreen-symbolic", 24);
+ gtk_widget_set_visible(GTK_WIDGET(player->priv->showhide_playlist_button), TRUE);
- gtk_window_unfullscreen (GTK_WINDOW (player->priv->window));
- gtk_notebook_set_current_page (GTK_NOTEBOOK (player->priv->playlist_nt), current_page);
+ gtk_window_unfullscreen(GTK_WINDOW(player->priv->window));
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(player->priv->playlist_nt), current_page);
player->priv->full_screen = FALSE;
} else {
- gtk_widget_hide (player->priv->menu_bar);
- gtk_widget_hide (player->priv->playlist_nt);
+ gtk_widget_hide(player->priv->menu_bar);
+ gtk_widget_hide(player->priv->playlist_nt);
parole_player_set_playlist_visible(player, FALSE);
- gtk_menu_item_set_label (GTK_MENU_ITEM(player->priv->fullscreen_menu_item), _("Leave _Fullscreen"));
- gtk_widget_set_tooltip_text (player->priv->fullscreen_button, _("Leave Fullscreen"));
- gtk_image_set_from_icon_name (GTK_IMAGE(player->priv->fullscreen_image), "view-restore-symbolic", 24);
- gtk_widget_set_visible (GTK_WIDGET(player->priv->showhide_playlist_button), FALSE);
+ gtk_menu_item_set_label(GTK_MENU_ITEM(player->priv->fullscreen_menu_item), _("Leave _Fullscreen"));
+ gtk_widget_set_tooltip_text(player->priv->fullscreen_button, _("Leave Fullscreen"));
+ gtk_image_set_from_icon_name(GTK_IMAGE(player->priv->fullscreen_image), "view-restore-symbolic", 24);
+ gtk_widget_set_visible(GTK_WIDGET(player->priv->showhide_playlist_button), FALSE);
- current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (player->priv->playlist_nt));
+ current_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(player->priv->playlist_nt));
- gtk_window_fullscreen (GTK_WINDOW (player->priv->window));
+ gtk_window_fullscreen(GTK_WINDOW(player->priv->window));
player->priv->full_screen = TRUE;
}
}
if ( player->priv->embedded ) {
- gtk_widget_hide (player->priv->menu_bar);
- gtk_widget_hide (player->priv->playlist_nt);
- gtk_widget_hide (player->priv->fullscreen_button);
- gtk_widget_hide (player->priv->showhide_playlist_button);
+ gtk_widget_hide(player->priv->menu_bar);
+ gtk_widget_hide(player->priv->playlist_nt);
+ gtk_widget_hide(player->priv->fullscreen_button);
+ gtk_widget_hide(player->priv->showhide_playlist_button);
} else {
if ( player->priv->mini_mode ) {
- gtk_widget_hide (player->priv->menu_bar);
- gtk_widget_hide (player->priv->playlist_nt);
- gtk_widget_hide (player->priv->fullscreen_button);
- gtk_widget_hide (player->priv->showhide_playlist_button);
- gtk_widget_hide (player->priv->audiobox_text);
- gtk_widget_set_halign (player->priv->audiobox_cover, GTK_ALIGN_CENTER);
+ gtk_widget_hide(player->priv->menu_bar);
+ gtk_widget_hide(player->priv->playlist_nt);
+ gtk_widget_hide(player->priv->fullscreen_button);
+ gtk_widget_hide(player->priv->showhide_playlist_button);
+ gtk_widget_hide(player->priv->audiobox_text);
+ gtk_widget_set_halign(player->priv->audiobox_cover, GTK_ALIGN_CENTER);
gtk_widget_hide(player->priv->range);
gtk_widget_show(player->priv->label_divider);
- gtk_window_resize (GTK_WINDOW (player->priv->window), 256, 256);
- gtk_widget_set_size_request (GTK_WIDGET (player->priv->window), 256, 256);
- gtk_window_set_default_size (GTK_WINDOW (player->priv->window), 256, 256);
- gtk_window_set_resizable (GTK_WINDOW (player->priv->window), FALSE);
+ gtk_window_resize(GTK_WINDOW(player->priv->window), 256, 256);
+ gtk_widget_set_size_request(GTK_WIDGET(player->priv->window), 256, 256);
+ gtk_window_set_default_size(GTK_WINDOW(player->priv->window), 256, 256);
+ gtk_window_set_resizable(GTK_WINDOW(player->priv->window), FALSE);
} else {
- gtk_widget_set_size_request (GTK_WIDGET (player->priv->window), -1, -1);
- gtk_window_set_default_size (GTK_WINDOW (player->priv->window), -1, -1);
- gtk_window_set_resizable (GTK_WINDOW (player->priv->window), TRUE);
+ gtk_widget_set_size_request(GTK_WIDGET(player->priv->window), -1, -1);
+ gtk_window_set_default_size(GTK_WINDOW(player->priv->window), -1, -1);
+ gtk_window_set_resizable(GTK_WINDOW(player->priv->window), TRUE);
- gtk_widget_show (player->priv->audiobox_text);
- gtk_widget_show (player->priv->fullscreen_button);
+ gtk_widget_show(player->priv->audiobox_text);
+ gtk_widget_show(player->priv->fullscreen_button);
gtk_widget_hide(player->priv->label_divider);
gtk_widget_show(player->priv->range);
- gtk_widget_set_halign (player->priv->audiobox_cover, GTK_ALIGN_END);
+ gtk_widget_set_halign(player->priv->audiobox_cover, GTK_ALIGN_END);
if ( !player->priv->full_screen ) {
- gtk_widget_show (player->priv->menu_bar);
- gtk_widget_show (player->priv->showhide_playlist_button);
+ gtk_widget_show(player->priv->menu_bar);
+ gtk_widget_show(player->priv->showhide_playlist_button);
if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (player->priv->showhide_playlist_button)) )
- gtk_widget_show (player->priv->playlist_nt);
- gtk_window_resize (GTK_WINDOW (player->priv->window), w, h);
+ gtk_widget_show(player->priv->playlist_nt);
+ gtk_window_resize(GTK_WINDOW(player->priv->window), w, h);
}
}
}
}
void
-parole_player_embedded (ParolePlayer *player)
+parole_player_embedded(ParolePlayer *player)
{
if ( player->priv->embedded == TRUE )
return;
@@ -2141,7 +2141,7 @@ parole_player_embedded (ParolePlayer *player)
}
void
-parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
+parole_player_full_screen(ParolePlayer *player, gboolean fullscreen)
{
if ( player->priv->full_screen == fullscreen )
return;
@@ -2149,27 +2149,27 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
parole_player_reset_controls(player, fullscreen);
}
-void parole_player_fullscreen_action_cb (GSimpleAction *action)
+void parole_player_fullscreen_action_cb(GSimpleAction *action)
{
- parole_player_full_screen (parole_player, !parole_player->priv->full_screen);
+ parole_player_full_screen(parole_player, !parole_player->priv->full_screen);
}
-static void parole_player_hide_menubar_cb (GtkWidget *widget, ParolePlayer *player)
+static void parole_player_hide_menubar_cb(GtkWidget *widget, ParolePlayer *player)
{
- player->priv->show_menubar = !gtk_widget_get_visible (player->priv->menu_bar);
+ player->priv->show_menubar = !gtk_widget_get_visible(player->priv->menu_bar);
if (!player->priv->full_screen)
- gtk_widget_set_visible (player->priv->menu_bar, player->priv->show_menubar);
+ gtk_widget_set_visible(player->priv->menu_bar, player->priv->show_menubar);
}
-static void parole_player_toggle_mini_mode_cb (GtkWidget *widget, ParolePlayer *player)
+static void parole_player_toggle_mini_mode_cb(GtkWidget *widget, ParolePlayer *player)
{
- gboolean active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget));
+ gboolean active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
player->priv->mini_mode = active;
parole_player_reset_controls(player, FALSE);
}
static void
-parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time)
+parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
{
GtkWidget *menu, *mi;
gboolean sensitive;
@@ -2177,66 +2177,66 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
gtk_window_add_accel_group(GTK_WINDOW(player->priv->window), accels);
- player->priv->current_media_type = parole_gst_get_current_stream_type (PAROLE_GST (player->priv->gst));
+ player->priv->current_media_type = parole_gst_get_current_stream_type(PAROLE_GST(player->priv->gst));
- menu = gtk_menu_new ();
+ menu = gtk_menu_new();
/*Play menu item
*/
- mi = gtk_menu_item_new_with_mnemonic (player->priv->state == PAROLE_STATE_PLAYING ? _("_Pause"):_("_Play"));
+ mi = gtk_menu_item_new_with_mnemonic(player->priv->state == PAROLE_STATE_PLAYING ? _("_Pause"):_("_Play"));
- g_object_get (G_OBJECT (player->priv->playpause_button),
+ g_object_get(G_OBJECT(player->priv->playpause_button),
"sensitive", &sensitive,
NULL);
- gtk_widget_set_sensitive (mi, sensitive);
- gtk_widget_show (mi);
+ gtk_widget_set_sensitive(mi, sensitive);
+ gtk_widget_show(mi);
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_playpause_action);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Previous item in playlist.
*/
- mi = gtk_menu_item_new_with_mnemonic (_("_Previous"));
- gtk_widget_set_sensitive (mi, (player->priv->state >= PAROLE_STATE_PAUSED));
- gtk_widget_show (mi);
+ mi = gtk_menu_item_new_with_mnemonic(_("_Previous"));
+ gtk_widget_set_sensitive(mi, (player->priv->state >= PAROLE_STATE_PAUSED));
+ gtk_widget_show(mi);
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_previous_action);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Next item in playlist.
*/
- mi = gtk_menu_item_new_with_mnemonic (_("_Next"));
- gtk_widget_set_sensitive (mi, (player->priv->state >= PAROLE_STATE_PAUSED));
- gtk_widget_show (mi);
+ mi = gtk_menu_item_new_with_mnemonic(_("_Next"));
+ gtk_widget_set_sensitive(mi, (player->priv->state >= PAROLE_STATE_PAUSED));
+ gtk_widget_show(mi);
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_next_action);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Un/Full screen
*/
- mi = gtk_menu_item_new_with_mnemonic (player->priv->full_screen ? _("_Leave Fullscreen"):_("_Fullscreen"));
- gtk_widget_show (mi);
+ mi = gtk_menu_item_new_with_mnemonic(player->priv->full_screen ? _("_Leave Fullscreen"):_("_Fullscreen"));
+ gtk_widget_show(mi);
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_fullscreen_action);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
if (!player->priv->full_screen)
{
mi = gtk_separator_menu_item_new();
gtk_widget_show(GTK_WIDGET(mi));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Un/Hide menubar
*/
mi = gtk_check_menu_item_new_with_label(_("Show menubar"));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi), gtk_widget_get_visible(player->priv->menu_bar));
- g_signal_connect (mi, "activate",
- G_CALLBACK (parole_player_hide_menubar_cb), player);
+ g_signal_connect(mi, "activate",
+ G_CALLBACK(parole_player_hide_menubar_cb), player);
gtk_widget_add_accelerator(mi, "activate", accels,
GDK_KEY_m, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
if ( player->priv->mini_mode ) {
gtk_widget_set_sensitive(GTK_WIDGET(mi), FALSE);
@@ -2244,23 +2244,23 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
mi = gtk_separator_menu_item_new();
gtk_widget_show(GTK_WIDGET(mi));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
mi = gtk_check_menu_item_new_with_label(_("Mini Mode"));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi), player->priv->mini_mode);
- g_signal_connect (mi, "activate",
- G_CALLBACK (parole_player_toggle_mini_mode_cb), player);
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ g_signal_connect(mi, "activate",
+ G_CALLBACK(parole_player_toggle_mini_mode_cb), player);
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
}
- g_signal_connect_swapped (menu, "selection-done",
- G_CALLBACK (gtk_widget_destroy), menu);
+ g_signal_connect_swapped(menu, "selection-done",
+ G_CALLBACK(gtk_widget_destroy), menu);
#if GTK_CHECK_VERSION(3, 22, 0)
- gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
#else
- gtk_menu_popup (GTK_MENU (menu),
+ gtk_menu_popup(GTK_MENU(menu),
NULL, NULL,
NULL, NULL,
button, activate_time);
@@ -2268,31 +2268,31 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
}
gboolean
-parole_player_gst_widget_button_press (GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
+parole_player_gst_widget_button_press(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
{
gboolean ret_val = FALSE;
gboolean sensitive = FALSE;
gint w, h;
if ( ev->type == GDK_2BUTTON_PRESS ) {
- g_action_activate (G_ACTION(player->priv->media_fullscreen_action), NULL);
+ g_action_activate(G_ACTION(player->priv->media_fullscreen_action), NULL);
ret_val = TRUE;
- } else if (ev->button == 1 && gtk_widget_get_visible (player->priv->logo_image)) {
+ } else if (ev->button == 1 && gtk_widget_get_visible(player->priv->logo_image)) {
/* Clicking on the play or replay logo will activate appropriate functionality */
- h = gtk_widget_get_allocated_height (widget);
- w = gtk_widget_get_allocated_width (widget);
+ h = gtk_widget_get_allocated_height(widget);
+ w = gtk_widget_get_allocated_width(widget);
if ( (ev->x > ((w / 2) - 128) && ev->x < ((w / 2) + 128)) &&
(ev->y > ((h / 2) - 128) && ev->y < ((h / 2) + 128)) )
{
- g_object_get (G_OBJECT (player->priv->playpause_button),
+ g_object_get(G_OBJECT(player->priv->playpause_button),
"sensitive", &sensitive,
NULL);
if (sensitive)
- parole_player_toggle_playpause (player);
+ parole_player_toggle_playpause(player);
else
- parole_media_list_open (player->priv->list);
+ parole_media_list_open(player->priv->list);
}
}
@@ -2300,66 +2300,66 @@ parole_player_gst_widget_button_press (GtkWidget *widget, GdkEventButton *ev, Pa
}
gboolean
-parole_player_gst_widget_button_release (GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
+parole_player_gst_widget_button_release(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
{
gboolean ret_val = FALSE;
if ( ev->button == 3 ) {
- parole_player_show_menu (player, ev->button, ev->time);
- gtk_widget_grab_focus (widget);
+ parole_player_show_menu(player, ev->button, ev->time);
+ gtk_widget_grab_focus(widget);
ret_val = TRUE;
} else if ( ev->button == 1 ) {
- gtk_widget_grab_focus (widget);
+ gtk_widget_grab_focus(widget);
ret_val = TRUE;
}
return ret_val;
}
-gboolean parole_player_hide_controls (gpointer data)
+gboolean parole_player_hide_controls(gpointer data)
{
ParolePlayer *player;
TRACE("start");
- player = PAROLE_PLAYER (data);
+ player = PAROLE_PLAYER(data);
gtk_revealer_set_reveal_child(GTK_REVEALER(player->priv->revealer), FALSE);
- parole_player_set_cursor_visible (player, FALSE);
+ parole_player_set_cursor_visible(player, FALSE);
return FALSE;
}
gboolean
-parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion *ev, ParolePlayer *player)
+parole_player_gst_widget_motion_notify_event(GtkWidget *widget, GdkEventMotion *ev, ParolePlayer *player)
{
static gulong hide_timeout;
int hide_controls_timeout;
if ( hide_timeout != 0)
{
- g_source_remove_by_user_data (player);
+ g_source_remove_by_user_data(player);
hide_timeout = 0;
}
- gtk_widget_show (gtk_widget_get_parent(player->priv->control));
+ gtk_widget_show(gtk_widget_get_parent(player->priv->control));
- parole_player_set_cursor_visible (player, TRUE);
+ parole_player_set_cursor_visible(player, TRUE);
if (gtk_revealer_get_reveal_child(GTK_REVEALER(player->priv->revealer))) {
if ((gdouble)gtk_widget_get_allocated_height(widget) - ev->y >= 32.0) {
if ( player->priv->state == PAROLE_STATE_PLAYING ) {
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"hide-controls-timeout", &hide_controls_timeout,
NULL);
if (hide_controls_timeout != 0 || player->priv->full_screen) {
if (player->priv->full_screen)
- hide_timeout = g_timeout_add_seconds (4,
+ hide_timeout = g_timeout_add_seconds(4,
(GSourceFunc) parole_player_hide_controls, player);
else
- hide_timeout = g_timeout_add_seconds (hide_controls_timeout,
+ hide_timeout = g_timeout_add_seconds(hide_controls_timeout,
(GSourceFunc) parole_player_hide_controls, player);
}
}
@@ -2372,72 +2372,72 @@ parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion
}
void
-parole_player_menu_open_location_cb (GtkWidget *widget, ParolePlayer *player)
+parole_player_menu_open_location_cb(GtkWidget *widget, ParolePlayer *player)
{
- parole_media_list_open_location (player->priv->list);
+ parole_media_list_open_location(player->priv->list);
}
void
-parole_player_menu_add_cb (GtkWidget *widget, ParolePlayer *player)
+parole_player_menu_add_cb(GtkWidget *widget, ParolePlayer *player)
{
- parole_media_list_open (player->priv->list);
+ parole_media_list_open(player->priv->list);
}
void
-parole_player_save_playlist_cb (GtkWidget *widget, ParolePlayer *player)
+parole_player_save_playlist_cb(GtkWidget *widget, ParolePlayer *player)
{
parole_media_list_save_cb(widget, player->priv->list);
}
void
-parole_player_media_menu_select_cb (GtkMenuItem *widget, ParolePlayer *player)
+parole_player_media_menu_select_cb(GtkMenuItem *widget, ParolePlayer *player)
{
- gtk_widget_set_sensitive (player->priv->save_playlist,
- !parole_media_list_is_empty (player->priv->list));
+ gtk_widget_set_sensitive(player->priv->save_playlist,
+ !parole_media_list_is_empty(player->priv->list));
}
static void
-parole_player_playback_menu_select_cb (GtkMenuItem *widget, ParolePlayer *player)
+parole_player_playback_menu_select_cb(GtkMenuItem *widget, ParolePlayer *player)
{
- gtk_widget_set_sensitive (player->priv->goto_position,
- !parole_media_list_is_empty (player->priv->list));
+ gtk_widget_set_sensitive(player->priv->goto_position,
+ !parole_media_list_is_empty(player->priv->list));
}
-void parole_player_open_preferences_cb (GtkWidget *widget, ParolePlayer *player)
+void parole_player_open_preferences_cb(GtkWidget *widget, ParolePlayer *player)
{
- parole_conf_dialog_open (player->priv->settings_dialog, player->priv->window);
+ parole_conf_dialog_open(player->priv->settings_dialog, player->priv->window);
}
void
-parole_player_menu_exit_cb (GtkWidget *widget, ParolePlayer *player)
+parole_player_menu_exit_cb(GtkWidget *widget, ParolePlayer *player)
{
- parole_player_delete_event_cb (NULL, NULL, player);
+ parole_player_delete_event_cb(NULL, NULL, player);
}
static void
-parole_property_notify_cb_volume (ParoleGst *gst, GParamSpec *spec, ParolePlayer *player)
+parole_property_notify_cb_volume(ParoleGst *gst, GParamSpec *spec, ParolePlayer *player)
{
gdouble volume;
- volume = parole_gst_get_volume (PAROLE_GST (player->priv->gst));
- gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), volume);
+ volume = parole_gst_get_volume(PAROLE_GST(player->priv->gst));
+ gtk_scale_button_set_value(GTK_SCALE_BUTTON(player->priv->volume), volume);
}
static void
-parole_player_change_volume (ParolePlayer *player, gdouble value)
+parole_player_change_volume(ParolePlayer *player, gdouble value)
{
- parole_gst_set_volume (PAROLE_GST (player->priv->gst), value);
+ parole_gst_set_volume(PAROLE_GST(player->priv->gst), value);
}
gboolean
-parole_player_volume_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, ParolePlayer *player)
+parole_player_volume_scroll_event_cb(GtkWidget *widget, GdkEventScroll *ev, ParolePlayer *player)
{
gboolean ret_val = FALSE;
if ( ev->direction == GDK_SCROLL_UP ) {
- parole_player_volume_up (NULL, player);
+ parole_player_volume_up(NULL, player);
ret_val = TRUE;
} else if ( ev->direction == GDK_SCROLL_DOWN ) {
- parole_player_volume_down (NULL, player);
+ parole_player_volume_down(NULL, player);
ret_val = TRUE;
}
@@ -2445,42 +2445,42 @@ parole_player_volume_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, Par
}
void
-parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value, ParolePlayer *player)
+parole_player_volume_value_changed_cb(GtkScaleButton *widget, gdouble value, ParolePlayer *player)
{
- parole_player_change_volume (player, value);
+ parole_player_change_volume(player, value);
/* Do not update the value unless it has changed! */
if ((int)(value*100) != (int)(player->priv->last_volume*100))
{
player->priv->last_volume = value;
if ( value > 0.0 )
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"volume", (gint)(value * 100),
NULL);
}
}
void
-parole_player_volume_up (GtkWidget *widget, ParolePlayer *player)
+parole_player_volume_up(GtkWidget *widget, ParolePlayer *player)
{
gdouble value;
- value = gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume));
- gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), value + 0.05);
+ value = gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume));
+ gtk_scale_button_set_value(GTK_SCALE_BUTTON(player->priv->volume), value + 0.05);
}
void
-parole_player_volume_down (GtkWidget *widget, ParolePlayer *player)
+parole_player_volume_down(GtkWidget *widget, ParolePlayer *player)
{
gdouble value;
- value = gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume));
- gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), value - 0.05);
+ value = gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume));
+ gtk_scale_button_set_value(GTK_SCALE_BUTTON(player->priv->volume), value - 0.05);
}
-void parole_player_volume_mute (GtkWidget *widget, ParolePlayer *player)
+void parole_player_volume_mute(GtkWidget *widget, ParolePlayer *player)
{
gint value;
- if (gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume)) == 0.0) {
- g_object_get (G_OBJECT (player->priv->conf),
+ if (gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume)) == 0.0) {
+ g_object_get(G_OBJECT(player->priv->conf),
"volume", &value,
NULL);
gtk_menu_item_set_label(GTK_MENU_ITEM(player->priv->mute), _("Mute"));
@@ -2492,75 +2492,75 @@ void parole_player_volume_mute (GtkWidget *widget, ParolePlayer *player)
}
static void
-parole_player_sm_quit_requested_cb (ParolePlayer *player)
+parole_player_sm_quit_requested_cb(ParolePlayer *player)
{
player->priv->exit = TRUE;
- parole_gst_terminate (PAROLE_GST (player->priv->gst));
+ parole_gst_terminate(PAROLE_GST(player->priv->gst));
}
static void
-parole_player_finalize (GObject *object)
+parole_player_finalize(GObject *object)
{
ParolePlayer *player;
- player = PAROLE_PLAYER (object);
+ player = PAROLE_PLAYER(object);
- TRACE ("start");
+ TRACE("start");
- dbus_g_connection_unref (player->priv->bus);
+ dbus_g_connection_unref(player->priv->bus);
- g_object_unref (player->priv->conf);
- g_object_unref (player->priv->video_filter);
- g_object_unref (player->priv->disc);
- g_object_unref (player->priv->screen_saver);
+ g_object_unref(player->priv->conf);
+ g_object_unref(player->priv->video_filter);
+ g_object_unref(player->priv->disc);
+ g_object_unref(player->priv->screen_saver);
if ( player->priv->client_id )
- g_free (player->priv->client_id);
+ g_free(player->priv->client_id);
- g_object_unref (player->priv->sm_client);
+ g_object_unref(player->priv->sm_client);
#ifdef HAVE_XF86_KEYSYM
if (player->priv->button)
- g_object_unref (player->priv->button);
+ g_object_unref(player->priv->button);
#endif
- G_OBJECT_CLASS (parole_player_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_player_parent_class)->finalize(object);
}
-static void parole_player_set_property (GObject *object,
+static void parole_player_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
ParolePlayer *player;
- player = PAROLE_PLAYER (object);
+ player = PAROLE_PLAYER(object);
switch (prop_id)
{
case PROP_CLIENT_ID:
- player->priv->client_id = g_value_dup_string (value);
+ player->priv->client_id = g_value_dup_string(value);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
-static void parole_player_get_property (GObject *object,
+static void parole_player_get_property(GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
ParolePlayer *player;
- player = PAROLE_PLAYER (object);
+ player = PAROLE_PLAYER(object);
switch (prop_id)
{
case PROP_CLIENT_ID:
- g_value_set_string (value, player->priv->client_id);
+ g_value_set_string(value, player->priv->client_id);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
@@ -2569,7 +2569,7 @@ static void parole_player_get_property (GObject *object,
* Get the SM client
**/
static void
-parole_player_constructed (GObject *object)
+parole_player_constructed(GObject *object)
{
ParolePlayer *player;
gchar *current_dir;
@@ -2581,11 +2581,11 @@ parole_player_constructed (GObject *object)
NULL
};
- player = PAROLE_PLAYER (object);
+ player = PAROLE_PLAYER(object);
- current_dir = g_get_current_dir ();
+ current_dir = g_get_current_dir();
- player->priv->sm_client = xfce_sm_client_get_full (XFCE_SM_CLIENT_RESTART_NORMAL,
+ player->priv->sm_client = xfce_sm_client_get_full(XFCE_SM_CLIENT_RESTART_NORMAL,
XFCE_SM_CLIENT_PRIORITY_DEFAULT,
player->priv->client_id,
current_dir,
@@ -2594,17 +2594,17 @@ parole_player_constructed (GObject *object)
if ( xfce_sm_client_connect (player->priv->sm_client, NULL ) )
{
- g_signal_connect_swapped (player->priv->sm_client, "quit-requested",
- G_CALLBACK (parole_player_sm_quit_requested_cb), player);
+ g_signal_connect_swapped(player->priv->sm_client, "quit-requested",
+ G_CALLBACK(parole_player_sm_quit_requested_cb), player);
}
- g_free (current_dir);
+ g_free(current_dir);
}
static void
-parole_player_class_init (ParolePlayerClass *klass)
+parole_player_class_init(ParolePlayerClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->constructed = parole_player_constructed;
object_class->finalize = parole_player_finalize;
@@ -2618,9 +2618,9 @@ parole_player_class_init (ParolePlayerClass *klass)
* Sm Manager client ID
* Since: 0.2.2
**/
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_CLIENT_ID,
- g_param_spec_string ("client-id",
+ g_param_spec_string("client-id",
NULL,
NULL,
NULL,
@@ -2628,7 +2628,7 @@ parole_player_class_init (ParolePlayerClass *klass)
g_type_class_add_private (klass, sizeof (ParolePlayerPrivate));
- parole_player_dbus_class_init (klass);
+ parole_player_dbus_class_init(klass);
}
/**
@@ -2638,17 +2638,17 @@ parole_player_class_init (ParolePlayerClass *klass)
*
*/
static void
-parole_player_reset_saver_changed_cb (ParolePlayer *player)
+parole_player_reset_saver_changed_cb(ParolePlayer *player)
{
const ParoleStream *stream;
- stream = parole_gst_get_stream (PAROLE_GST (player->priv->gst));
- TRACE ("Reset saver configuration changed");
- parole_player_reset_saver_changed (player, stream);
+ stream = parole_gst_get_stream(PAROLE_GST(player->priv->gst));
+ TRACE("Reset saver configuration changed");
+ parole_player_reset_saver_changed(player, stream);
}
static gboolean
-parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
+parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player)
{
GtkWidget *focused;
/* Seek duration in seconds */
@@ -2656,7 +2656,7 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
gboolean ret_val = FALSE;
- focused = gtk_window_get_focus (GTK_WINDOW (player->priv->window));
+ focused = gtk_window_get_focus(GTK_WINDOW(player->priv->window));
if ( focused )
{
@@ -2674,7 +2674,7 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
case GDK_KEY_f:
case GDK_KEY_F:
if ( player->priv->embedded != TRUE ) {
- g_action_activate (G_ACTION(player->priv->media_fullscreen_action), NULL);
+ g_action_activate(G_ACTION(player->priv->media_fullscreen_action), NULL);
}
ret_val = TRUE;
break;
@@ -2689,9 +2689,9 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
if ( gtk_widget_get_sensitive (player->priv->range) )
{
if (ev->state & GDK_CONTROL_MASK) {
- parole_player_seekf_cb (NULL, player, seek_medium);
+ parole_player_seekf_cb(NULL, player, seek_medium);
} else {
- parole_player_seekf_cb (NULL, player, seek_short);
+ parole_player_seekf_cb(NULL, player, seek_short);
}
}
ret_val = TRUE;
@@ -2700,27 +2700,27 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
if ( gtk_widget_get_sensitive (player->priv->range) )
{
if (ev->state & GDK_CONTROL_MASK) {
- parole_player_seekb_cb (NULL, player, seek_medium);
+ parole_player_seekb_cb(NULL, player, seek_medium);
} else {
- parole_player_seekb_cb (NULL, player, seek_short);
+ parole_player_seekb_cb(NULL, player, seek_short);
}
}
ret_val = TRUE;
break;
case GDK_KEY_Page_Down:
- if ( gtk_widget_get_sensitive (player->priv->range) ) {
- parole_player_seekb_cb (NULL, player, seek_long);
+ if ( gtk_widget_get_sensitive(player->priv->range) ) {
+ parole_player_seekb_cb(NULL, player, seek_long);
}
ret_val = TRUE;
break;
case GDK_KEY_Page_Up:
- if ( gtk_widget_get_sensitive (player->priv->range) ) {
- parole_player_seekf_cb (NULL, player, seek_long);
+ if ( gtk_widget_get_sensitive(player->priv->range) ) {
+ parole_player_seekf_cb(NULL, player, seek_long);
}
ret_val = TRUE;
break;
case GDK_KEY_Escape:
- parole_player_full_screen (player, FALSE);
+ parole_player_full_screen(player, FALSE);
break;
case GDK_KEY_m:
if (ev->state & GDK_CONTROL_MASK) {
@@ -2741,14 +2741,14 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
case GDK_KEY_q:
case GDK_KEY_Q:
if (ev->state & GDK_CONTROL_MASK) {
- parole_player_quit (player);
+ parole_player_quit(player);
ret_val = TRUE;
break;
}
#ifdef HAVE_XF86_KEYSYM
case XF86XK_OpenURL:
- parole_player_full_screen (player, FALSE);
- parole_media_list_open_location (player->priv->list);
+ parole_player_full_screen(player, FALSE);
+ parole_media_list_open_location(player->priv->list);
break;
#endif
/*
@@ -2758,7 +2758,7 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
case GDK_KEY_Up:
case GDK_KEY_Down:
if (!player->priv->full_screen && gtk_widget_get_visible(player->priv->playlist_nt)) {
- parole_media_list_grab_focus (player->priv->list);
+ parole_media_list_grab_focus(player->priv->list);
}
break;
default:
@@ -2769,7 +2769,7 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
}
gboolean
-parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player)
+parole_player_key_press(GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player)
{
gboolean enabled;
@@ -2783,7 +2783,7 @@ parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *playe
}
#ifdef HAVE_XF86_KEYSYM
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"multimedia-keys", &enabled,
NULL);
if (enabled)
@@ -2791,25 +2791,25 @@ parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *playe
switch (ev->keyval)
{
case XF86XK_AudioPlay:
- parole_player_toggle_playpause (player);
+ parole_player_toggle_playpause(player);
return TRUE;
case XF86XK_AudioStop:
- parole_player_pause_clicked (NULL, player);
+ parole_player_pause_clicked(NULL, player);
return TRUE;
case XF86XK_AudioRaiseVolume:
- parole_player_volume_up (NULL, player);
+ parole_player_volume_up(NULL, player);
return TRUE;
case XF86XK_AudioLowerVolume:
- parole_player_volume_down (NULL, player);
+ parole_player_volume_down(NULL, player);
return TRUE;
case XF86XK_AudioMute:
- parole_player_volume_mute (NULL, player);
+ parole_player_volume_mute(NULL, player);
return TRUE;
case XF86XK_AudioPrev:
- parole_player_play_prev (player);
+ parole_player_play_prev(player);
return TRUE;
case XF86XK_AudioNext:
- parole_player_play_next (player, TRUE);
+ parole_player_play_next(player, TRUE);
return TRUE;
default:
break;
@@ -2822,18 +2822,18 @@ parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *playe
#ifdef HAVE_XF86_KEYSYM
static void
-parole_player_button_pressed_cb (ParoleButton *button, ParoleButtonKey key, ParolePlayer *player)
+parole_player_button_pressed_cb(ParoleButton *button, ParoleButtonKey key, ParolePlayer *player)
{
gboolean enabled;
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"multimedia-keys", &enabled,
NULL);
if (!enabled)
return;
- PAROLE_DEBUG_ENUM ("Button Press:", key, ENUM_GTYPE_BUTTON_KEY);
+ PAROLE_DEBUG_ENUM("Button Press:", key, ENUM_GTYPE_BUTTON_KEY);
switch (key)
{
@@ -2841,13 +2841,13 @@ parole_player_button_pressed_cb (ParoleButton *button, ParoleButtonKey key, Paro
parole_player_toggle_playpause(player);
break;
case PAROLE_KEY_AUDIO_STOP:
- parole_player_pause_clicked (NULL, player);
+ parole_player_pause_clicked(NULL, player);
break;
case PAROLE_KEY_AUDIO_PREV:
- parole_player_play_prev (player);
+ parole_player_play_prev(player);
break;
case PAROLE_KEY_AUDIO_NEXT:
- parole_player_play_next (player, TRUE);
+ parole_player_play_next(player, TRUE);
break;
default:
break;
@@ -2856,12 +2856,12 @@ parole_player_button_pressed_cb (ParoleButton *button, ParoleButtonKey key, Paro
#endif
static void
-parole_gst_set_default_aspect_ratio (ParolePlayer *player, GtkBuilder *builder)
+parole_gst_set_default_aspect_ratio(ParolePlayer *player, GtkBuilder *builder)
{
ParoleAspectRatio ratio;
const gchar *widget_name;
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"aspect-ratio", &ratio,
NULL);
@@ -2886,15 +2886,15 @@ parole_gst_set_default_aspect_ratio (ParolePlayer *player, GtkBuilder *builder)
widget_name = "ratio_20_9";
break;
default:
- g_warn_if_reached ();
+ g_warn_if_reached();
return;
}
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, widget_name)), TRUE);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_builder_get_object(builder, widget_name)), TRUE);
}
static void
-on_bug_report_clicked (GtkWidget *w, ParolePlayer *player)
+on_bug_report_clicked(GtkWidget *w, ParolePlayer *player)
{
GtkWidget *dialog;
#if GTK_CHECK_VERSION(3, 22, 0)
@@ -2915,13 +2915,13 @@ on_bug_report_clicked (GtkWidget *w, ParolePlayer *player)
}
static void
-on_contents_clicked (GtkWidget *w, ParolePlayer *player)
+on_contents_clicked(GtkWidget *w, ParolePlayer *player)
{
- xfce_dialog_show_help_with_version (NULL, "parole", "start", NULL, PAROLE_VERSION_SHORT);
+ xfce_dialog_show_help_with_version(NULL, "parole", "start", NULL, PAROLE_VERSION_SHORT);
}
static gboolean
-on_goto_position_clicked (GtkWidget *w, ParolePlayer *player)
+on_goto_position_clicked(GtkWidget *w, ParolePlayer *player)
{
GtkWidget *dialog;
GtkWidget *vbox, *hbox, *label;
@@ -2934,76 +2934,76 @@ on_goto_position_clicked (GtkWidget *w, ParolePlayer *player)
int cur_hrs, cur_mins, cur_secs;
/* Create dialog */
- dialog = gtk_dialog_new_with_buttons (_("Go to position"),
+ dialog = gtk_dialog_new_with_buttons(_("Go to position"),
GTK_WINDOW(player->priv->window),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
_("Cancel"), GTK_RESPONSE_CANCEL,
_("Go"), GTK_RESPONSE_OK,
NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
/* pack boxes and spinbutton */
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
- label = gtk_label_new (_("Position:"));
- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
- gtk_widget_set_halign (GTK_WIDGET(label), GTK_ALIGN_START);
- gtk_widget_set_valign (GTK_WIDGET(label), GTK_ALIGN_CENTER);
+ label = gtk_label_new(_("Position:"));
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+ gtk_widget_set_halign(GTK_WIDGET(label), GTK_ALIGN_START);
+ gtk_widget_set_valign(GTK_WIDGET(label), GTK_ALIGN_CENTER);
/* Get the stream length and set that as maximum for hours and minutes */
- adjustment = gtk_range_get_adjustment (GTK_RANGE (player->priv->range));
- duration = gtk_adjustment_get_upper (adjustment);
- current_position = gtk_range_get_value (GTK_RANGE (player->priv->range));
+ adjustment = gtk_range_get_adjustment(GTK_RANGE(player->priv->range));
+ duration = gtk_adjustment_get_upper(adjustment);
+ current_position = gtk_range_get_value(GTK_RANGE(player->priv->range));
max_hrs = (int) duration/3600;
if ( duration/60 <= 59 )
max_mins = (int) duration/60;
- spin_hrs = gtk_spin_button_new_with_range (0, max_hrs, 1);
- spin_mins = gtk_spin_button_new_with_range (0, max_mins, 1);
- spin_secs = gtk_spin_button_new_with_range (0, 59, 1);
- gtk_box_pack_start (GTK_BOX (hbox), spin_hrs, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), spin_mins, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), spin_secs, FALSE, FALSE, 0);
+ spin_hrs = gtk_spin_button_new_with_range(0, max_hrs, 1);
+ spin_mins = gtk_spin_button_new_with_range(0, max_mins, 1);
+ spin_secs = gtk_spin_button_new_with_range(0, 59, 1);
+ gtk_box_pack_start(GTK_BOX(hbox), spin_hrs, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), spin_mins, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), spin_secs, FALSE, FALSE, 0);
if ( duration < 3600 )
- gtk_widget_set_sensitive (GTK_WIDGET (spin_hrs), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(spin_hrs), FALSE);
if ( duration < 60 )
- gtk_widget_set_sensitive (GTK_WIDGET (spin_mins), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(spin_mins), FALSE);
if ( duration == 0 )
- gtk_widget_set_sensitive (GTK_WIDGET (spin_secs), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(spin_secs), FALSE);
if ( current_position != 0 )
{
cur_hrs = (int) current_position/3600;
cur_mins = (int) current_position/60 - cur_hrs*60;
cur_secs = (int) current_position - cur_hrs*3600 - cur_mins*60;
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_hrs), cur_hrs);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_mins), cur_mins);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_secs), cur_secs);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_hrs), cur_hrs);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_mins), cur_mins);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_secs), cur_secs);
}
// FIXME: Prevent the mouse-cursor and controls from hiding
/* show dialog */
- gtk_widget_show_all (dialog);
- response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_show_all(dialog);
+ response = gtk_dialog_run(GTK_DIALOG(dialog));
if (response == GTK_RESPONSE_OK)
{
/* update range according to the value */
- hrs = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin_hrs));
- mins = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin_mins));
- secs = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin_secs));
+ hrs = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_hrs));
+ mins = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_mins));
+ secs = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_secs));
position = hrs*3600 + mins*60 + secs;
- parole_gst_seek (PAROLE_GST (player->priv->gst), position);
- parole_player_change_range_value (player, position);
+ parole_gst_seek(PAROLE_GST(player->priv->gst), position);
+ parole_player_change_range_value(player, position);
}
- gtk_widget_destroy (GTK_WIDGET (dialog));
+ gtk_widget_destroy(GTK_WIDGET(dialog));
return (response == GTK_RESPONSE_OK);
}
@@ -3017,9 +3017,9 @@ on_goto_position_clicked (GtkWidget *w, ParolePlayer *player)
* NOTE: Transparency is not supported, so there's also no fadeout.
**/
static gboolean
-parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
+parole_overlay_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
{
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
GtkStyleContext *context;
#if GTK_CHECK_VERSION(3, 16, 0)
#else
@@ -3027,24 +3027,24 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
#endif
gtk_widget_get_allocation(widget, allocation);
- cairo_rectangle (cr, 0, 0, allocation->width, allocation->height);
- g_free (allocation);
+ cairo_rectangle(cr, 0, 0, allocation->width, allocation->height);
+ g_free(allocation);
context = gtk_widget_get_style_context(GTK_WIDGET(widget));
- gtk_style_context_add_class (context, "background");
- gtk_style_context_add_class (context, "osd");
+ gtk_style_context_add_class(context, "background");
+ gtk_style_context_add_class(context, "osd");
#if GTK_CHECK_VERSION(3, 16, 0)
#else
- gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
- gdk_cairo_set_source_rgba (cr, &acolor);
- cairo_fill (cr);
-
- gtk_style_context_get_border_color (context, GTK_STATE_NORMAL, &acolor);
- gdk_cairo_set_source_rgba (cr, &acolor);
- cairo_move_to (cr, 0, 0);
- cairo_line_to (cr, allocation->width, 0);
- cairo_stroke (cr);
+ gtk_style_context_get_background_color(context, GTK_STATE_NORMAL, &acolor);
+ gdk_cairo_set_source_rgba(cr, &acolor);
+ cairo_fill(cr);
+
+ gtk_style_context_get_border_color(context, GTK_STATE_NORMAL, &acolor);
+ gdk_cairo_set_source_rgba(cr, &acolor);
+ cairo_move_to(cr, 0, 0);
+ cairo_line_to(cr, allocation->width, 0);
+ cairo_stroke(cr);
#endif
return FALSE;
@@ -3052,9 +3052,9 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
/* This function allows smoothly adjusting the window alignment with coverart */
static gboolean
-parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player)
+parole_audiobox_expose_event(GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player)
{
- GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+ GtkAllocation *allocation = g_new0(GtkAllocation, 1);
gboolean homogeneous;
/* Float the cover and text together in the middle if there is space */
@@ -3069,7 +3069,7 @@ parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer *pl
gtk_box_set_homogeneous(GTK_BOX(w), homogeneous);
/* Expand the coverart if the parent box packing is homogenous */
- gtk_box_set_child_packing (GTK_BOX(w),
+ gtk_box_set_child_packing(GTK_BOX(w),
player->priv->audiobox_cover,
homogeneous,
TRUE,
@@ -3080,30 +3080,30 @@ parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer *pl
}
void
-on_content_area_size_allocate (GtkWidget *widget, GtkAllocation *allocation, ParolePlayer *player)
+on_content_area_size_allocate(GtkWidget *widget, GtkAllocation *allocation, ParolePlayer *player)
{
- g_return_if_fail (allocation != NULL);
+ g_return_if_fail(allocation != NULL);
gtk_widget_set_allocation(widget, allocation);
if ( gtk_widget_get_realized (widget) )
{
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw(widget);
}
}
gboolean
-parole_player_configure_event_cb (GtkWidget *widget, GdkEventConfigure *ev, ParolePlayer *player)
+parole_player_configure_event_cb(GtkWidget *widget, GdkEventConfigure *ev, ParolePlayer *player)
{
gint old_w, old_h, new_w, new_h;
/* Get the current window size */
- gtk_window_get_size (GTK_WINDOW (widget), &new_w, &new_h);
+ gtk_window_get_size(GTK_WINDOW(widget), &new_w, &new_h);
if ( !player->priv->full_screen )
{
/* Store the previously saved window size in case of maximize */
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"window-width", &old_w,
"window-height", &old_h,
NULL);
@@ -3115,7 +3115,7 @@ parole_player_configure_event_cb (GtkWidget *widget, GdkEventConfigure *ev, Paro
player->priv->last_h = old_h;
if ( !player->priv->mini_mode )
- g_object_set (G_OBJECT (player->priv->conf),
+ g_object_set(G_OBJECT(player->priv->conf),
"window-width", new_w,
"window-height", new_h,
NULL);
@@ -3126,7 +3126,7 @@ parole_player_configure_event_cb (GtkWidget *widget, GdkEventConfigure *ev, Paro
}
static void
-parole_player_drag_data_received_cb (GtkWidget *widget,
+parole_player_drag_data_received_cb(GtkWidget *widget,
GdkDragContext *drag_context,
gint x,
gint y,
@@ -3139,46 +3139,46 @@ parole_player_drag_data_received_cb (GtkWidget *widget,
guint added = 0;
guint i;
- parole_window_busy_cursor (gtk_widget_get_window(widget));
+ parole_window_busy_cursor(gtk_widget_get_window(widget));
- uri_list = g_uri_list_extract_uris ((const gchar *)gtk_selection_data_get_data(data));
+ uri_list = g_uri_list_extract_uris((const gchar *)gtk_selection_data_get_data(data));
for ( i = 0; uri_list[i] != NULL; i++)
{
gchar *path;
- path = g_filename_from_uri (uri_list[i], NULL, NULL);
- added += parole_media_list_add_by_path (player->priv->list, path, i == 0 ? TRUE : FALSE);
+ path = g_filename_from_uri(uri_list[i], NULL, NULL);
+ added += parole_media_list_add_by_path(player->priv->list, path, i == 0 ? TRUE : FALSE);
- g_free (path);
+ g_free(path);
}
- g_strfreev (uri_list);
+ g_strfreev(uri_list);
- parole_player_set_cursor_visible (player, TRUE);
- gtk_drag_finish (drag_context, added == i ? TRUE : FALSE, FALSE, drag_time);
+ parole_player_set_cursor_visible(player, TRUE);
+ gtk_drag_finish(drag_context, added == i ? TRUE : FALSE, FALSE, drag_time);
}
static void
-parole_player_set_cursor_visible (ParolePlayer *player, gboolean visible)
+parole_player_set_cursor_visible(ParolePlayer *player, gboolean visible)
{
GdkWindow *gdkwindow;
- gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->eventbox_output));
+ gdkwindow = gtk_widget_get_window(GTK_WIDGET(player->priv->eventbox_output));
if (visible) {
- parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst), TRUE);
- parole_window_normal_cursor (gdkwindow);
- } else if (gtk_window_is_active (GTK_WINDOW (player->priv->window))) {
- parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst), FALSE);
- parole_window_invisible_cursor (gdkwindow);
+ parole_gst_set_cursor_visible(PAROLE_GST(player->priv->gst), TRUE);
+ parole_window_normal_cursor(gdkwindow);
+ } else if (gtk_window_is_active(GTK_WINDOW(player->priv->window))) {
+ parole_gst_set_cursor_visible(PAROLE_GST(player->priv->gst), FALSE);
+ parole_window_invisible_cursor(gdkwindow);
}
}
static void
-parole_player_window_notify_is_active (ParolePlayer *player)
+parole_player_window_notify_is_active(ParolePlayer *player)
{
- if (!gtk_window_is_active (GTK_WINDOW (player->priv->window))) {
- parole_player_set_cursor_visible (player, TRUE);
+ if (!gtk_window_is_active(GTK_WINDOW(player->priv->window))) {
+ parole_player_set_cursor_visible(player, TRUE);
} else {
- parole_player_set_cursor_visible (player, FALSE);
+ parole_player_set_cursor_visible(player, FALSE);
}
}
@@ -3192,7 +3192,7 @@ parole_player_window_notify_is_active (ParolePlayer *player)
* NOTE: The widget has to be realized first.
**/
static void
-parole_player_set_wm_opacity_hint (GtkWidget *widget)
+parole_player_set_wm_opacity_hint(GtkWidget *widget)
{
GdkScreen *gdkscreen;
GdkDisplay *gdkdisplay;
@@ -3201,19 +3201,19 @@ parole_player_set_wm_opacity_hint (GtkWidget *widget)
Atom atom;
char mode = 1;
- gdkscreen = gtk_widget_get_screen (widget);
- gdkdisplay = gdk_screen_get_display (gdkscreen);
+ gdkscreen = gtk_widget_get_screen(widget);
+ gdkdisplay = gdk_screen_get_display(gdkscreen);
- xdisplay = GDK_DISPLAY_XDISPLAY (gdkdisplay);
+ xdisplay = GDK_DISPLAY_XDISPLAY(gdkdisplay);
- atom = XInternAtom (xdisplay, "_NET_WM_WINDOW_OPACITY_LOCKED", TRUE);
+ atom = XInternAtom(xdisplay, "_NET_WM_WINDOW_OPACITY_LOCKED", TRUE);
if ( atom == None )
return;
- gdkwindow = gtk_widget_get_window (widget);
+ gdkwindow = gtk_widget_get_window(widget);
- XChangeProperty (xdisplay, gdk_x11_window_get_xid (gdkwindow),
+ XChangeProperty(xdisplay, gdk_x11_window_get_xid(gdkwindow),
atom, XA_CARDINAL,
32, PropModeAppend,
(guchar *) &mode,
@@ -3221,7 +3221,7 @@ parole_player_set_wm_opacity_hint (GtkWidget *widget)
}
static void
-parole_player_init (ParolePlayer *player)
+parole_player_init(ParolePlayer *player)
{
/* Builder */
GtkBuilder *builder;
@@ -3270,47 +3270,47 @@ parole_player_init (ParolePlayer *player)
g_setenv("PULSE_PROP_media.role", "video", TRUE);
- player->priv = PAROLE_PLAYER_GET_PRIVATE (player);
+ player->priv = PAROLE_PLAYER_GET_PRIVATE(player);
player->priv->client_id = NULL;
player->priv->sm_client = NULL;
- player->priv->bus = parole_g_session_bus_get ();
+ player->priv->bus = parole_g_session_bus_get();
player->priv->current_media_type = PAROLE_MEDIA_TYPE_UNKNOWN;
- player->priv->video_filter = parole_get_supported_video_filter ();
- g_object_ref_sink (player->priv->video_filter);
+ player->priv->video_filter = parole_get_supported_video_filter();
+ g_object_ref_sink(player->priv->video_filter);
- builder = parole_builder_get_main_interface ();
+ builder = parole_builder_get_main_interface();
/* ParoleConf */
- player->priv->conf = parole_conf_new ();
+ player->priv->conf = parole_conf_new();
player->priv->settings_dialog = parole_conf_dialog_new();
- g_signal_connect_swapped (player->priv->conf, "notify::reset-saver",
- G_CALLBACK (parole_player_reset_saver_changed_cb), player);
+ g_signal_connect_swapped(player->priv->conf, "notify::reset-saver",
+ G_CALLBACK(parole_player_reset_saver_changed_cb), player);
/* ParoleGst */
- player->priv->gst = parole_gst_new (player->priv->conf);
+ player->priv->gst = parole_gst_new(player->priv->conf);
/* ParoleDisc */
- player->priv->disc = parole_disc_new ();
- g_signal_connect (player->priv->disc, "disc-selected",
- G_CALLBACK (parole_player_disc_selected_cb), player);
+ player->priv->disc = parole_disc_new();
+ g_signal_connect(player->priv->disc, "disc-selected",
+ G_CALLBACK(parole_player_disc_selected_cb), player);
/* ParoleButton */
#ifdef HAVE_XF86_KEYSYM
- player->priv->button = parole_button_new ();
- g_signal_connect (player->priv->button, "button-pressed",
- G_CALLBACK (parole_player_button_pressed_cb), player);
+ player->priv->button = parole_button_new();
+ g_signal_connect(player->priv->button, "button-pressed",
+ G_CALLBACK(parole_player_button_pressed_cb), player);
#endif
/* ParoleScreenSaver */
- player->priv->screen_saver = parole_screen_saver_new ();
+ player->priv->screen_saver = parole_screen_saver_new();
/* ParoleMediaList */
- player->priv->list = PAROLE_MEDIA_LIST (parole_media_list_get ());
+ player->priv->list = PAROLE_MEDIA_LIST(parole_media_list_get());
player->priv->state = PAROLE_STATE_STOPPED;
player->priv->user_seeking = FALSE;
@@ -3321,10 +3321,10 @@ parole_player_init (ParolePlayer *player)
player->priv->row = NULL;
player->priv->wait_for_gst_disc_info = FALSE;
- player->priv->recent = gtk_recent_manager_get_default ();
+ player->priv->recent = gtk_recent_manager_get_default();
/* Get properties from ParoleConf */
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"showhide-playlist", &showhide,
"videosink", &videosink,
"volume", &volume,
@@ -3340,49 +3340,49 @@ parole_player_init (ParolePlayer *player)
* GTK Widgets
*/
/* ParolePlayer Window */
- player->priv->window = GTK_WIDGET (gtk_builder_get_object (builder, "main-window"));
- g_signal_connect_after (G_OBJECT (player->priv->window),
+ player->priv->window = GTK_WIDGET(gtk_builder_get_object(builder, "main-window"));
+ g_signal_connect_after(G_OBJECT(player->priv->window),
"window-state-event",
- G_CALLBACK (parole_player_window_state_event),
- PAROLE_PLAYER (player));
+ G_CALLBACK(parole_player_window_state_event),
+ PAROLE_PLAYER(player));
// Playlist notebook
- player->priv->playlist_nt = GTK_WIDGET (gtk_builder_get_object (builder, "notebook-playlist"));
- gtk_notebook_append_page (GTK_NOTEBOOK (player->priv->playlist_nt),
- GTK_WIDGET (player->priv->list),
- gtk_label_new (_("Playlist")));
+ player->priv->playlist_nt = GTK_WIDGET(gtk_builder_get_object(builder, "notebook-playlist"));
+ gtk_notebook_append_page(GTK_NOTEBOOK(player->priv->playlist_nt),
+ GTK_WIDGET(player->priv->list),
+ gtk_label_new(_("Playlist")));
// Playlist divider/handle
- hpaned = GTK_WIDGET (gtk_builder_get_object (builder, "hpaned"));
- gtk_widget_style_get (hpaned, "handle-size", &player->priv->handle_width, NULL);
+ hpaned = GTK_WIDGET(gtk_builder_get_object(builder, "hpaned"));
+ gtk_widget_style_get(hpaned, "handle-size", &player->priv->handle_width, NULL);
/* Menu Bar */
- player->priv->menu_bar = GTK_WIDGET (gtk_builder_get_object (builder, "menubar"));
+ player->priv->menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menubar"));
/* Media Menu */
// Save Playlist
- player->priv->save_playlist = GTK_WIDGET (gtk_builder_get_object (builder, "menu-save-playlist"));
- g_signal_connect (player->priv->save_playlist,
+ player->priv->save_playlist = GTK_WIDGET(gtk_builder_get_object(builder, "menu-save-playlist"));
+ g_signal_connect(player->priv->save_playlist,
"activate",
- G_CALLBACK (parole_player_save_playlist_cb),
- PAROLE_PLAYER (player));
- g_signal_connect (gtk_builder_get_object (builder, "media-menu"), "select",
- G_CALLBACK (parole_player_media_menu_select_cb), player);
+ G_CALLBACK(parole_player_save_playlist_cb),
+ PAROLE_PLAYER(player));
+ g_signal_connect(gtk_builder_get_object(builder, "media-menu"), "select",
+ G_CALLBACK(parole_player_media_menu_select_cb), player);
/* Recent Submenu */
- recent_menu = GTK_WIDGET (gtk_builder_get_object (builder, "recent_menu"));
+ recent_menu = GTK_WIDGET(gtk_builder_get_object(builder, "recent_menu"));
// Initialize the Recent Menu settings
- player->priv->recent_menu = gtk_recent_chooser_menu_new_for_manager (player->priv->recent);
- gtk_recent_chooser_menu_set_show_numbers (GTK_RECENT_CHOOSER_MENU(player->priv->recent_menu), TRUE);
- gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER(player->priv->recent_menu), GTK_RECENT_SORT_MRU);
- gtk_recent_chooser_set_show_private (GTK_RECENT_CHOOSER(player->priv->recent_menu), FALSE);
- gtk_recent_chooser_set_show_not_found (GTK_RECENT_CHOOSER(player->priv->recent_menu), FALSE);
- gtk_recent_chooser_set_local_only (GTK_RECENT_CHOOSER(player->priv->recent_menu), TRUE);
+ player->priv->recent_menu = gtk_recent_chooser_menu_new_for_manager(player->priv->recent);
+ gtk_recent_chooser_menu_set_show_numbers(GTK_RECENT_CHOOSER_MENU(player->priv->recent_menu), TRUE);
+ gtk_recent_chooser_set_sort_type(GTK_RECENT_CHOOSER(player->priv->recent_menu), GTK_RECENT_SORT_MRU);
+ gtk_recent_chooser_set_show_private(GTK_RECENT_CHOOSER(player->priv->recent_menu), FALSE);
+ gtk_recent_chooser_set_show_not_found(GTK_RECENT_CHOOSER(player->priv->recent_menu), FALSE);
+ gtk_recent_chooser_set_local_only(GTK_RECENT_CHOOSER(player->priv->recent_menu), TRUE);
// Recent Menu file filter
- recent_filter = parole_get_supported_recent_media_filter ();
+ recent_filter = parole_get_supported_recent_media_filter();
gtk_recent_filter_add_application(recent_filter, "parole");
gtk_recent_chooser_set_filter(GTK_RECENT_CHOOSER(player->priv->recent_menu), recent_filter);
@@ -3391,56 +3391,56 @@ parole_player_init (ParolePlayer *player)
gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->recent_menu), recent_separator);
// Clear Recent Menu Item
- clear_recent = gtk_menu_item_new_with_mnemonic (_("_Clear recent items…"));
+ clear_recent = gtk_menu_item_new_with_mnemonic(_("_Clear recent items…"));
gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->recent_menu), clear_recent);
// Recent Menu signals
- g_signal_connect (player->priv->recent_menu, "item-activated",
- G_CALLBACK (parole_player_recent_menu_item_activated_cb), player);
- g_signal_connect (clear_recent, "activate",
- G_CALLBACK (parole_player_recent_menu_clear_activated_cb), player);
+ g_signal_connect(player->priv->recent_menu, "item-activated",
+ G_CALLBACK(parole_player_recent_menu_item_activated_cb), player);
+ g_signal_connect(clear_recent, "activate",
+ G_CALLBACK(parole_player_recent_menu_clear_activated_cb), player);
/* Attach the Recent Menu */
gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent_menu), player->priv->recent_menu);
/* DVD Menu */
- player->priv->dvd_menu = GTK_WIDGET(gtk_builder_get_object (builder, "dvd-menu"));
- player->priv->chapters_menu = GTK_WIDGET (gtk_builder_get_object (builder, "chapters-menu"));
+ player->priv->dvd_menu = GTK_WIDGET(gtk_builder_get_object(builder, "dvd-menu"));
+ player->priv->chapters_menu = GTK_WIDGET(gtk_builder_get_object(builder, "chapters-menu"));
/* Language Menus */
- player->priv->subtitles_menu = GTK_WIDGET (gtk_builder_get_object (builder, "subtitles-menu"));
- player->priv->languages_menu = GTK_WIDGET (gtk_builder_get_object (builder, "languages-menu"));
+ player->priv->subtitles_menu = GTK_WIDGET(gtk_builder_get_object(builder, "subtitles-menu"));
+ player->priv->languages_menu = GTK_WIDGET(gtk_builder_get_object(builder, "languages-menu"));
- player->priv->subtitles_group = GTK_WIDGET (gtk_builder_get_object (builder, "subtitles-menu-none"));
- player->priv->subtitles_menu_custom = GTK_WIDGET (gtk_builder_get_object (builder, "subtitles-menu-custom"));
+ player->priv->subtitles_group = GTK_WIDGET(gtk_builder_get_object(builder, "subtitles-menu-none"));
+ player->priv->subtitles_menu_custom = GTK_WIDGET(gtk_builder_get_object(builder, "subtitles-menu-custom"));
- g_signal_connect (player->priv->subtitles_menu_custom, "activate",
- G_CALLBACK (parole_player_select_custom_subtitle), player);
+ g_signal_connect(player->priv->subtitles_menu_custom, "activate",
+ G_CALLBACK(parole_player_select_custom_subtitle), player);
player->priv->audio_group = NULL;
/* Additional Menu Items */
- bug_report = GTK_WIDGET (gtk_builder_get_object (builder, "bug-report"));
- g_signal_connect (bug_report, "activate",
- G_CALLBACK (on_bug_report_clicked), player);
+ bug_report = GTK_WIDGET(gtk_builder_get_object(builder, "bug-report"));
+ g_signal_connect(bug_report, "activate",
+ G_CALLBACK(on_bug_report_clicked), player);
- contents = GTK_WIDGET (gtk_builder_get_object (builder, "contents"));
- g_signal_connect (contents, "activate",
- G_CALLBACK (on_contents_clicked), player);
+ contents = GTK_WIDGET(gtk_builder_get_object(builder, "contents"));
+ g_signal_connect(contents, "activate",
+ G_CALLBACK(on_contents_clicked), player);
- player->priv->goto_position = GTK_WIDGET (gtk_builder_get_object (builder, "goto_position"));
- g_signal_connect (player->priv->goto_position, "activate",
- G_CALLBACK (on_goto_position_clicked), player);
+ player->priv->goto_position = GTK_WIDGET(gtk_builder_get_object(builder, "goto_position"));
+ g_signal_connect(player->priv->goto_position, "activate",
+ G_CALLBACK(on_goto_position_clicked), player);
- g_signal_connect (gtk_builder_get_object (builder, "playback-menu"), "select",
- G_CALLBACK (parole_player_playback_menu_select_cb), player);
+ g_signal_connect(gtk_builder_get_object(builder, "playback-menu"), "select",
+ G_CALLBACK(parole_player_playback_menu_select_cb), player);
player->priv->show_menubar = TRUE;
/* End Menu Bar */
/* Content Area (Background, Audio, Video) */
- player->priv->eventbox_output = GTK_WIDGET (gtk_builder_get_object (builder, "content_area"));
+ player->priv->eventbox_output = GTK_WIDGET(gtk_builder_get_object(builder, "content_area"));
#if GTK_CHECK_VERSION(3, 16, 0)
#else
@@ -3449,31 +3449,31 @@ parole_player_init (ParolePlayer *player)
#endif
// Enable motion-notify event to show/hide controls on mouseover
- gtk_widget_add_events (GTK_WIDGET (player->priv->eventbox_output),
+ gtk_widget_add_events(GTK_WIDGET(player->priv->eventbox_output),
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
// Enable DND for files onto output widget
- gtk_drag_dest_set (player->priv->eventbox_output, GTK_DEST_DEFAULT_ALL,
- target_entry, G_N_ELEMENTS (target_entry),
+ gtk_drag_dest_set(player->priv->eventbox_output, GTK_DEST_DEFAULT_ALL,
+ target_entry, G_N_ELEMENTS(target_entry),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
- g_signal_connect (player->priv->eventbox_output, "drag-data-received",
- G_CALLBACK (parole_player_drag_data_received_cb), player);
+ g_signal_connect(player->priv->eventbox_output, "drag-data-received",
+ G_CALLBACK(parole_player_drag_data_received_cb), player);
// Background Image
- logo = gdk_pixbuf_new_from_file (g_strdup_printf ("%s/play.png", PIXMAPS_DIR), NULL);
- player->priv->logo_image = GTK_WIDGET (gtk_builder_get_object (builder, "logo"));
+ logo = gdk_pixbuf_new_from_file(g_strdup_printf("%s/play.png", PIXMAPS_DIR), NULL);
+ player->priv->logo_image = GTK_WIDGET(gtk_builder_get_object(builder, "logo"));
gtk_image_set_from_pixbuf(GTK_IMAGE(player->priv->logo_image), logo);
// Video Box
- player->priv->videobox = GTK_WIDGET (gtk_builder_get_object (builder, "video_output"));
+ player->priv->videobox = GTK_WIDGET(gtk_builder_get_object(builder, "video_output"));
// Audio Box
- player->priv->audiobox = GTK_WIDGET (gtk_builder_get_object (builder, "audio_output"));
- player->priv->audiobox_cover = GTK_WIDGET (gtk_builder_get_object (builder, "audio_cover"));
- player->priv->audiobox_text = GTK_WIDGET (gtk_builder_get_object (builder, "audio_text"));
- player->priv->audiobox_title = GTK_WIDGET (gtk_builder_get_object (builder, "audio_title"));
- player->priv->audiobox_album = GTK_WIDGET (gtk_builder_get_object (builder, "audio_album"));
- player->priv->audiobox_artist = GTK_WIDGET (gtk_builder_get_object (builder, "audio_artist"));
+ player->priv->audiobox = GTK_WIDGET(gtk_builder_get_object(builder, "audio_output"));
+ player->priv->audiobox_cover = GTK_WIDGET(gtk_builder_get_object(builder, "audio_cover"));
+ player->priv->audiobox_text = GTK_WIDGET(gtk_builder_get_object(builder, "audio_text"));
+ player->priv->audiobox_title = GTK_WIDGET(gtk_builder_get_object(builder, "audio_title"));
+ player->priv->audiobox_album = GTK_WIDGET(gtk_builder_get_object(builder, "audio_album"));
+ player->priv->audiobox_artist = GTK_WIDGET(gtk_builder_get_object(builder, "audio_artist"));
g_signal_connect(player->priv->audiobox, "draw",
G_CALLBACK(parole_audiobox_expose_event), player);
@@ -3482,137 +3482,137 @@ parole_player_init (ParolePlayer *player)
/* Play / Pause */
// GSimpleAction
- player->priv->media_playpause_action = g_simple_action_new ("playpause_action", NULL);
- g_simple_action_set_enabled (player->priv->media_playpause_action, FALSE);
+ player->priv->media_playpause_action = g_simple_action_new("playpause_action", NULL);
+ g_simple_action_set_enabled(player->priv->media_playpause_action, FALSE);
playpause_action = player->priv->media_playpause_action;
// Button & Image
- player->priv->playpause_button = GTK_WIDGET (gtk_builder_get_object(builder, "media_playpause"));
- player->priv->playpause_image = GTK_WIDGET (gtk_builder_get_object(builder, "image_media_playpause"));
+ player->priv->playpause_button = GTK_WIDGET(gtk_builder_get_object(builder, "media_playpause"));
+ player->priv->playpause_image = GTK_WIDGET(gtk_builder_get_object(builder, "image_media_playpause"));
// Signals
- g_signal_connect (G_OBJECT (player->priv->media_playpause_action), "activate",
- G_CALLBACK (parole_player_playpause_action_cb), NULL);
- g_signal_connect (G_OBJECT (player->priv->playpause_button), "clicked",
- G_CALLBACK (parole_player_widget_activate_action), player->priv->media_playpause_action);
+ g_signal_connect(G_OBJECT(player->priv->media_playpause_action), "activate",
+ G_CALLBACK(parole_player_playpause_action_cb), NULL);
+ g_signal_connect(G_OBJECT(player->priv->playpause_button), "clicked",
+ G_CALLBACK(parole_player_widget_activate_action), player->priv->media_playpause_action);
/* Previous Track */
// GSimpleAction
- player->priv->media_previous_action = g_simple_action_new ("previous_action", NULL);
- g_simple_action_set_enabled (player->priv->media_previous_action, FALSE);
+ player->priv->media_previous_action = g_simple_action_new("previous_action", NULL);
+ g_simple_action_set_enabled(player->priv->media_previous_action, FALSE);
previous_action = player->priv->media_previous_action;
// Button
- player->priv->previous_button = GTK_WIDGET (gtk_builder_get_object(builder, "media_previous"));
- gtk_widget_set_tooltip_text (GTK_WIDGET (player->priv->previous_button), _("Previous Track"));
- gtk_widget_set_sensitive (GTK_WIDGET (player->priv->previous_button), FALSE);
+ player->priv->previous_button = GTK_WIDGET(gtk_builder_get_object(builder, "media_previous"));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->previous_button), _("Previous Track"));
+ gtk_widget_set_sensitive(GTK_WIDGET(player->priv->previous_button), FALSE);
// Signals
- g_signal_connect (G_OBJECT (player->priv->media_previous_action), "activate",
- G_CALLBACK (parole_player_previous_action_cb), NULL);
- g_signal_connect (G_OBJECT (player->priv->previous_button), "clicked",
- G_CALLBACK (parole_player_widget_activate_action), player->priv->media_previous_action);
+ g_signal_connect(G_OBJECT(player->priv->media_previous_action), "activate",
+ G_CALLBACK(parole_player_previous_action_cb), NULL);
+ g_signal_connect(G_OBJECT(player->priv->previous_button), "clicked",
+ G_CALLBACK(parole_player_widget_activate_action), player->priv->media_previous_action);
/* Next Track */
// GSimpleAction
- player->priv->media_next_action = g_simple_action_new ("next_action", NULL);
- g_simple_action_set_enabled (player->priv->media_next_action, FALSE);
+ player->priv->media_next_action = g_simple_action_new("next_action", NULL);
+ g_simple_action_set_enabled(player->priv->media_next_action, FALSE);
next_action = player->priv->media_next_action;
// Button
- player->priv->next_button = GTK_WIDGET (gtk_builder_get_object(builder, "media_next"));
- gtk_widget_set_tooltip_text (GTK_WIDGET (player->priv->next_button), _("Next Track"));
- gtk_widget_set_sensitive (GTK_WIDGET (player->priv->next_button), FALSE);
+ player->priv->next_button = GTK_WIDGET(gtk_builder_get_object(builder, "media_next"));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->next_button), _("Next Track"));
+ gtk_widget_set_sensitive(GTK_WIDGET(player->priv->next_button), FALSE);
// Signals
- g_signal_connect (G_OBJECT (player->priv->media_next_action), "activate",
- G_CALLBACK (parole_player_next_action_cb), NULL);
- g_signal_connect (G_OBJECT (player->priv->next_button), "clicked",
- G_CALLBACK (parole_player_widget_activate_action), player->priv->media_next_action);
+ g_signal_connect(G_OBJECT(player->priv->media_next_action), "activate",
+ G_CALLBACK(parole_player_next_action_cb), NULL);
+ g_signal_connect(G_OBJECT(player->priv->next_button), "clicked",
+ G_CALLBACK(parole_player_widget_activate_action), player->priv->media_next_action);
/* Fullscreen */
// GSimpleAction
- player->priv->media_fullscreen_action = g_simple_action_new ("fullscreen_action", NULL);
- g_simple_action_set_enabled (player->priv->media_fullscreen_action, TRUE);
+ player->priv->media_fullscreen_action = g_simple_action_new("fullscreen_action", NULL);
+ g_simple_action_set_enabled(player->priv->media_fullscreen_action, TRUE);
// Button
- player->priv->fullscreen_button = GTK_WIDGET (gtk_builder_get_object (builder, "media_fullscreen"));
- gtk_widget_set_tooltip_text (GTK_WIDGET (player->priv->fullscreen_button), _("Fullscreen"));
+ player->priv->fullscreen_button = GTK_WIDGET(gtk_builder_get_object(builder, "media_fullscreen"));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->fullscreen_button), _("Fullscreen"));
// Menu Item
- player->priv->fullscreen_menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen-menu"));
- player->priv->fullscreen_image = GTK_WIDGET (gtk_builder_get_object (builder, "image_media_fullscreen"));
+ player->priv->fullscreen_menu_item = GTK_WIDGET(gtk_builder_get_object(builder, "fullscreen-menu"));
+ player->priv->fullscreen_image = GTK_WIDGET(gtk_builder_get_object(builder, "image_media_fullscreen"));
// Signals
- g_signal_connect (G_OBJECT (player->priv->media_fullscreen_action), "activate",
- G_CALLBACK (parole_player_fullscreen_action_cb), NULL);
- g_signal_connect (G_OBJECT (player->priv->fullscreen_button), "clicked",
- G_CALLBACK (parole_player_widget_activate_action), player->priv->media_fullscreen_action);
- g_signal_connect (G_OBJECT (player->priv->fullscreen_menu_item), "activate",
- G_CALLBACK (parole_player_widget_activate_action), player->priv->media_fullscreen_action);
+ g_signal_connect(G_OBJECT(player->priv->media_fullscreen_action), "activate",
+ G_CALLBACK(parole_player_fullscreen_action_cb), NULL);
+ g_signal_connect(G_OBJECT(player->priv->fullscreen_button), "clicked",
+ G_CALLBACK(parole_player_widget_activate_action), player->priv->media_fullscreen_action);
+ g_signal_connect(G_OBJECT(player->priv->fullscreen_menu_item), "activate",
+ G_CALLBACK(parole_player_widget_activate_action), player->priv->media_fullscreen_action);
/* Toggle Playlist */
// GSimpleAction
- player->priv->toggle_playlist_action = g_simple_toggle_action_new ("toggle_playlist_action", NULL);
- g_simple_action_set_enabled (player->priv->toggle_playlist_action, TRUE);
+ player->priv->toggle_playlist_action = g_simple_toggle_action_new("toggle_playlist_action", NULL);
+ g_simple_action_set_enabled(player->priv->toggle_playlist_action, TRUE);
// Button
- player->priv->showhide_playlist_button = GTK_WIDGET (gtk_builder_get_object (builder, "media_toggleplaylist"));
+ player->priv->showhide_playlist_button = GTK_WIDGET(gtk_builder_get_object(builder, "media_toggleplaylist"));
// Menu Item
- player->priv->showhide_playlist_menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "show-hide-list"));
- gtk_menu_item_set_label (GTK_MENU_ITEM (player->priv->showhide_playlist_menu_item), _("Show Playlist"));
+ player->priv->showhide_playlist_menu_item = GTK_WIDGET(gtk_builder_get_object(builder, "show-hide-list"));
+ gtk_menu_item_set_label(GTK_MENU_ITEM(player->priv->showhide_playlist_menu_item), _("Show Playlist"));
// Set playlist visible before signals are connected
- parole_player_set_playlist_visible (player, showhide);
+ parole_player_set_playlist_visible(player, showhide);
// Signals
- g_signal_connect (G_OBJECT (player->priv->toggle_playlist_action), "activate",
- G_CALLBACK (parole_player_toggle_playlist_action_cb), NULL);
- g_signal_connect (G_OBJECT (player->priv->showhide_playlist_menu_item), "activate",
- G_CALLBACK (parole_player_widget_activate_action), player->priv->toggle_playlist_action);
- g_signal_connect (G_OBJECT (player->priv->showhide_playlist_button), "clicked",
+ g_signal_connect(G_OBJECT(player->priv->toggle_playlist_action), "activate",
+ G_CALLBACK(parole_player_toggle_playlist_action_cb), NULL);
+ g_signal_connect(G_OBJECT(player->priv->showhide_playlist_menu_item), "activate",
+ G_CALLBACK(parole_player_widget_activate_action), player->priv->toggle_playlist_action);
+ g_signal_connect(G_OBJECT(player->priv->showhide_playlist_button), "clicked",
G_CALLBACK(parole_player_widget_activate_action), player->priv->toggle_playlist_action);
/* Toggle Repeat */
// GSimpleAction
- player->priv->toggle_repeat_action = g_simple_toggle_action_new ("toggle_repeat_action", NULL);
- g_simple_action_set_enabled (player->priv->toggle_repeat_action, TRUE);
+ player->priv->toggle_repeat_action = g_simple_toggle_action_new("toggle_repeat_action", NULL);
+ g_simple_action_set_enabled(player->priv->toggle_repeat_action, TRUE);
// Menu Item
- player->priv->repeat_menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "repeat"));
+ player->priv->repeat_menu_item = GTK_WIDGET(gtk_builder_get_object(builder, "repeat"));
// Signals
- g_signal_connect (G_OBJECT (player->priv->repeat_menu_item), "activate",
- G_CALLBACK (toggle_action_cb), player->priv->toggle_repeat_action);
- g_signal_connect (G_OBJECT (player->priv->toggle_repeat_action), "notify::state",
- G_CALLBACK (parole_player_repeat_state_changed), player);
+ g_signal_connect(G_OBJECT(player->priv->repeat_menu_item), "activate",
+ G_CALLBACK(toggle_action_cb), player->priv->toggle_repeat_action);
+ g_signal_connect(G_OBJECT(player->priv->toggle_repeat_action), "notify::state",
+ G_CALLBACK(parole_player_repeat_state_changed), player);
parole_media_list_connect_repeat_action(player->priv->list, player->priv->toggle_repeat_action);
- g_object_bind_property (G_OBJECT (player->priv->conf), "repeat",
+ g_object_bind_property(G_OBJECT(player->priv->conf), "repeat",
player->priv->repeat_menu_item, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Toggle Shuffle */
// GSimpleAction
- player->priv->toggle_shuffle_action = g_simple_toggle_action_new ("toggle_shuffle_action", NULL);
- g_simple_action_set_enabled (player->priv->toggle_shuffle_action, TRUE);
+ player->priv->toggle_shuffle_action = g_simple_toggle_action_new("toggle_shuffle_action", NULL);
+ g_simple_action_set_enabled(player->priv->toggle_shuffle_action, TRUE);
// Menu Item
- player->priv->shuffle_menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "shuffle"));
+ player->priv->shuffle_menu_item = GTK_WIDGET(gtk_builder_get_object(builder, "shuffle"));
// Signals
- g_signal_connect (G_OBJECT (player->priv->shuffle_menu_item), "activate",
- G_CALLBACK (toggle_action_cb), player->priv->toggle_shuffle_action);
- g_signal_connect (G_OBJECT (player->priv->toggle_shuffle_action), "notify::state",
- G_CALLBACK (parole_player_shuffle_state_changed), player);
+ g_signal_connect(G_OBJECT(player->priv->shuffle_menu_item), "activate",
+ G_CALLBACK(toggle_action_cb), player->priv->toggle_shuffle_action);
+ g_signal_connect(G_OBJECT(player->priv->toggle_shuffle_action), "notify::state",
+ G_CALLBACK(parole_player_shuffle_state_changed), player);
parole_media_list_connect_shuffle_action(player->priv->list, player->priv->toggle_shuffle_action);
- g_object_bind_property (G_OBJECT (player->priv->conf), "shuffle",
+ g_object_bind_property(G_OBJECT(player->priv->conf), "shuffle",
player->priv->shuffle_menu_item, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
@@ -3621,19 +3621,19 @@ parole_player_init (ParolePlayer *player)
/* Media Controls */
controls_overlay = GTK_WIDGET(gtk_overlay_new());
- player->priv->control = GTK_WIDGET (gtk_builder_get_object (builder, "control"));
+ player->priv->control = GTK_WIDGET(gtk_builder_get_object(builder, "control"));
- play_box = GTK_WIDGET (gtk_builder_get_object (builder, "media_controls"));
- controls_parent = GTK_WIDGET(gtk_builder_get_object (builder, "box2"));
- gtk_box_pack_start (GTK_BOX(controls_parent), controls_overlay, TRUE, TRUE, 0);
+ play_box = GTK_WIDGET(gtk_builder_get_object(builder, "media_controls"));
+ controls_parent = GTK_WIDGET(gtk_builder_get_object(builder, "box2"));
+ gtk_box_pack_start(GTK_BOX(controls_parent), controls_overlay, TRUE, TRUE, 0);
parole_widget_reparent(GTK_WIDGET(player->priv->eventbox_output), controls_overlay);
- player->priv->revealer = gtk_revealer_new ();
+ player->priv->revealer = gtk_revealer_new();
gtk_widget_set_vexpand(GTK_WIDGET(player->priv->revealer), FALSE);
gtk_widget_set_hexpand(GTK_WIDGET(player->priv->revealer), FALSE);
- gtk_revealer_set_transition_duration (GTK_REVEALER(player->priv->revealer), 250);
- gtk_revealer_set_transition_type (GTK_REVEALER(player->priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP);
+ gtk_revealer_set_transition_duration(GTK_REVEALER(player->priv->revealer), 250);
+ gtk_revealer_set_transition_type(GTK_REVEALER(player->priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP);
gtk_revealer_set_reveal_child(GTK_REVEALER(player->priv->revealer), TRUE);
gtk_widget_set_valign(player->priv->revealer, GTK_ALIGN_END);
@@ -3647,15 +3647,15 @@ parole_player_init (ParolePlayer *player)
gtk_widget_show_all(controls_parent);
/* Enable motion-notify event to prevent hiding controls on mouseover */
- gtk_widget_add_events (GTK_WIDGET (player->priv->control), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+ gtk_widget_add_events(GTK_WIDGET(player->priv->control), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
g_signal_connect(G_OBJECT(player->priv->control), "motion-notify-event",
G_CALLBACK(parole_player_gst_widget_motion_notify_event), player);
- gtk_widget_add_events (GTK_WIDGET (play_box), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+ gtk_widget_add_events(GTK_WIDGET(play_box), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
g_signal_connect(G_OBJECT(play_box), "motion-notify-event",
G_CALLBACK(parole_player_gst_widget_motion_notify_event), player);
for (widgets = gtk_container_get_children(GTK_CONTAINER(play_box)); widgets != NULL; widgets = g_list_next(widgets)) {
- gtk_widget_add_events (GTK_WIDGET (widgets->data), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+ gtk_widget_add_events(GTK_WIDGET(widgets->data), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
g_signal_connect(G_OBJECT(widgets->data), "motion-notify-event",
G_CALLBACK(parole_player_gst_widget_motion_notify_event), player);
}
@@ -3666,35 +3666,35 @@ parole_player_init (ParolePlayer *player)
player->priv->label_divider = GTK_WIDGET(gtk_builder_get_object(builder, "media_time_divider"));
/* Time Slider */
- player->priv->range = GTK_WIDGET (gtk_builder_get_object (builder, "media_progress_slider"));
+ player->priv->range = GTK_WIDGET(gtk_builder_get_object(builder, "media_progress_slider"));
gtk_widget_set_name(player->priv->range, "ParoleScale");
/* Buffering Progressbar */
- player->priv->progressbar_buffering = GTK_WIDGET (gtk_builder_get_object (builder, "media_buffering_progressbar"));
+ player->priv->progressbar_buffering = GTK_WIDGET(gtk_builder_get_object(builder, "media_buffering_progressbar"));
/* Volume Button */
- player->priv->volume = GTK_WIDGET (gtk_builder_get_object (builder, "media_volumebutton"));
- player->priv->mute = GTK_WIDGET (gtk_builder_get_object (builder, "volume-mute-menu"));
- parole_player_change_volume (player, (gdouble) (volume/100.));
+ player->priv->volume = GTK_WIDGET(gtk_builder_get_object(builder, "media_volumebutton"));
+ player->priv->mute = GTK_WIDGET(gtk_builder_get_object(builder, "volume-mute-menu"));
+ parole_player_change_volume(player, (gdouble)(volume/100.));
- gtk_widget_set_direction (GTK_WIDGET (gtk_builder_get_object (builder, "ltrbox")), GTK_TEXT_DIR_LTR);
+ gtk_widget_set_direction(GTK_WIDGET(gtk_builder_get_object(builder, "ltrbox")), GTK_TEXT_DIR_LTR);
g_signal_connect(player->priv->control, "draw", G_CALLBACK(parole_overlay_expose_event), NULL);
/* End Media Controls */
/* Info Bar */
// Placeholder widget
- hbox_infobar = GTK_WIDGET (gtk_builder_get_object (builder, "infobar_placeholder"));
+ hbox_infobar = GTK_WIDGET(gtk_builder_get_object(builder, "infobar_placeholder"));
// Initialize the InfoBar
- player->priv->infobar = gtk_info_bar_new ();
+ player->priv->infobar = gtk_info_bar_new();
gtk_info_bar_set_message_type(GTK_INFO_BAR(player->priv->infobar),
GTK_MESSAGE_QUESTION);
- gtk_widget_set_no_show_all (player->priv->infobar, TRUE);
+ gtk_widget_set_no_show_all(player->priv->infobar, TRUE);
- content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (player->priv->infobar));
- g_signal_connect (content_area, "size-allocate",
- G_CALLBACK (on_content_area_size_allocate), player);
+ content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(player->priv->infobar));
+ g_signal_connect(content_area, "size-allocate",
+ G_CALLBACK(on_content_area_size_allocate), player);
gtk_box_pack_start(GTK_BOX(hbox_infobar), player->priv->infobar, TRUE, TRUE, 0);
@@ -3707,8 +3707,8 @@ parole_player_init (ParolePlayer *player)
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(player->priv->combobox_audiotrack), cell, TRUE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(player->priv->combobox_audiotrack), cell, "text", 0, NULL);
- g_signal_connect (player->priv->combobox_audiotrack, "changed",
- G_CALLBACK (parole_player_combo_box_audiotrack_changed_cb), player);
+ g_signal_connect(player->priv->combobox_audiotrack, "changed",
+ G_CALLBACK(parole_player_combo_box_audiotrack_changed_cb), player);
// Humanize and pack the Audio Track combobox
audiotrack_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
@@ -3726,8 +3726,8 @@ parole_player_init (ParolePlayer *player)
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(player->priv->combobox_subtitles), sub_cell, TRUE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(player->priv->combobox_subtitles), sub_cell, "text", 0, NULL);
- g_signal_connect (player->priv->combobox_subtitles, "changed",
- G_CALLBACK (parole_player_combo_box_subtitles_changed_cb), player);
+ g_signal_connect(player->priv->combobox_subtitles, "changed",
+ G_CALLBACK(parole_player_combo_box_subtitles_changed_cb), player);
// Humanize and pack the Subtitles combobox
subtitle_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
@@ -3740,8 +3740,8 @@ parole_player_init (ParolePlayer *player)
infobar_close = gtk_button_new_with_label(_("Close"));
close_icon = gtk_image_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(infobar_close), close_icon);
- g_signal_connect (infobar_close, "clicked",
- G_CALLBACK (on_infobar_close_clicked), player);
+ g_signal_connect(infobar_close, "clicked",
+ G_CALLBACK(on_infobar_close_clicked), player);
gtk_box_pack_end(GTK_BOX(content_area), infobar_close, FALSE, FALSE, 0);
gtk_widget_show_all(content_area);
@@ -3759,145 +3759,145 @@ parole_player_init (ParolePlayer *player)
player->priv->clutter = parole_clutter_new(player->priv->conf);
clutterbox = parole_clutter_get_embed_widget(PAROLE_CLUTTER(player->priv->clutter));
- gtk_box_pack_start (GTK_BOX (player->priv->videobox),
+ gtk_box_pack_start(GTK_BOX(player->priv->videobox),
clutterbox,
TRUE, TRUE, 0);
- video_sink = parole_gst_video_sink (PAROLE_GST(player->priv->gst));
- parole_clutter_apply_texture (PAROLE_CLUTTER(player->priv->clutter), &video_sink);
+ video_sink = parole_gst_video_sink(PAROLE_GST(player->priv->gst));
+ parole_clutter_apply_texture(PAROLE_CLUTTER(player->priv->clutter), &video_sink);
- gtk_widget_show (player->priv->clutter);
- gtk_widget_grab_focus (player->priv->clutter);
+ gtk_widget_show(player->priv->clutter);
+ gtk_widget_grab_focus(player->priv->clutter);
} else {
- gtk_box_pack_start (GTK_BOX (player->priv->videobox),
+ gtk_box_pack_start(GTK_BOX(player->priv->videobox),
player->priv->gst,
TRUE, TRUE, 0);
- gtk_widget_realize (player->priv->gst);
- gtk_widget_show (player->priv->gst);
+ gtk_widget_realize(player->priv->gst);
+ gtk_widget_show(player->priv->gst);
- gtk_widget_grab_focus (player->priv->gst);
+ gtk_widget_grab_focus(player->priv->gst);
}
#else
- gtk_box_pack_start (GTK_BOX (player->priv->videobox),
+ gtk_box_pack_start(GTK_BOX(player->priv->videobox),
player->priv->gst,
TRUE, TRUE, 0);
- gtk_widget_realize (player->priv->gst);
- gtk_widget_show (player->priv->gst);
+ gtk_widget_realize(player->priv->gst);
+ gtk_widget_show(player->priv->gst);
- gtk_widget_grab_focus (player->priv->gst);
+ gtk_widget_grab_focus(player->priv->gst);
#endif
- parole_gst_set_default_aspect_ratio (player, builder);
+ parole_gst_set_default_aspect_ratio(player, builder);
/*
* Gst signals
*/
- g_signal_connect (G_OBJECT (player->priv->gst), "media-state",
- G_CALLBACK (parole_player_media_state_cb), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "media-state",
+ G_CALLBACK(parole_player_media_state_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "media-progressed",
- G_CALLBACK (parole_player_media_progressed_cb), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "media-progressed",
+ G_CALLBACK(parole_player_media_progressed_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "media-tag",
- G_CALLBACK (parole_player_media_tag_cb), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "media-tag",
+ G_CALLBACK(parole_player_media_tag_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "error",
- G_CALLBACK (parole_player_error_cb), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "error",
+ G_CALLBACK(parole_player_error_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "buffering",
- G_CALLBACK (parole_player_buffering_cb), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "buffering",
+ G_CALLBACK(parole_player_buffering_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "dvd-chapter-count-change",
- G_CALLBACK (parole_player_dvd_chapter_count_change_cb), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "dvd-chapter-count-change",
+ G_CALLBACK(parole_player_dvd_chapter_count_change_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "dvd-chapter-change",
- G_CALLBACK (parole_player_dvd_chapter_change_cb), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "dvd-chapter-change",
+ G_CALLBACK(parole_player_dvd_chapter_change_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "notify::volume",
- G_CALLBACK (parole_property_notify_cb_volume), player);
+ g_signal_connect(G_OBJECT(player->priv->gst), "notify::volume",
+ G_CALLBACK(parole_property_notify_cb_volume), player);
- g_signal_connect (G_OBJECT (parole_gst_get_stream (PAROLE_GST (player->priv->gst))), "notify::seekable",
- G_CALLBACK (parole_player_seekable_notify), player);
+ g_signal_connect(G_OBJECT(parole_gst_get_stream(PAROLE_GST(player->priv->gst))), "notify::seekable",
+ G_CALLBACK(parole_player_seekable_notify), player);
/*
* Media List Signals
*/
- g_signal_connect (player->priv->list, "media_activated",
- G_CALLBACK (parole_player_media_activated_cb), player);
+ g_signal_connect(player->priv->list, "media_activated",
+ G_CALLBACK(parole_player_media_activated_cb), player);
- g_signal_connect (player->priv->list, "media_cursor_changed",
- G_CALLBACK (parole_player_media_cursor_changed_cb), player);
+ g_signal_connect(player->priv->list, "media_cursor_changed",
+ G_CALLBACK(parole_player_media_cursor_changed_cb), player);
- g_signal_connect (player->priv->list, "uri-opened",
- G_CALLBACK (parole_player_uri_opened_cb), player);
+ g_signal_connect(player->priv->list, "uri-opened",
+ G_CALLBACK(parole_player_uri_opened_cb), player);
- g_signal_connect (player->priv->list, "show-playlist",
- G_CALLBACK (parole_player_media_list_show_playlist_cb), player);
+ g_signal_connect(player->priv->list, "show-playlist",
+ G_CALLBACK(parole_player_media_list_show_playlist_cb), player);
- g_signal_connect (player->priv->list, "iso-opened",
- G_CALLBACK (parole_player_iso_opened_cb), player);
+ g_signal_connect(player->priv->list, "iso-opened",
+ G_CALLBACK(parole_player_iso_opened_cb), player);
/*
* Load auto saved media list.
*/
- parole_media_list_load (player->priv->list);
+ parole_media_list_load(player->priv->list);
/*
* Connect remaining signals.
*/
- gtk_builder_connect_signals (builder, player);
- g_object_unref (builder);
+ gtk_builder_connect_signals(builder, player);
+ g_object_unref(builder);
/* Set up DBUS */
- parole_player_dbus_init (player);
+ parole_player_dbus_init(player);
/* Finish preparing the window. */
- g_signal_connect_swapped (player->priv->window, "notify::is-active",
- G_CALLBACK (parole_player_window_notify_is_active), player);
+ g_signal_connect_swapped(player->priv->window, "notify::is-active",
+ G_CALLBACK(parole_player_window_notify_is_active), player);
- gtk_window_set_default_size (GTK_WINDOW (player->priv->window), w, h);
- gtk_window_resize (GTK_WINDOW (player->priv->window), w, h);
+ gtk_window_set_default_size(GTK_WINDOW(player->priv->window), w, h);
+ gtk_window_resize(GTK_WINDOW(player->priv->window), w, h);
if (maximized)
- gtk_window_maximize(GTK_WINDOW (player->priv->window));
+ gtk_window_maximize(GTK_WINDOW(player->priv->window));
- gtk_widget_show_all (player->priv->window);
+ gtk_widget_show_all(player->priv->window);
- g_object_get (G_OBJECT (player->priv->conf),
+ g_object_get(G_OBJECT(player->priv->conf),
"always-hide-menubar", &always_hide_menubar,
NULL);
if (always_hide_menubar == TRUE)
- parole_player_hide_menubar_cb (NULL, player);
+ parole_player_hide_menubar_cb(NULL, player);
- parole_player_set_wm_opacity_hint (player->priv->window);
+ parole_player_set_wm_opacity_hint(player->priv->window);
}
ParolePlayer *
-parole_player_new (const gchar *client_id)
+parole_player_new(const gchar *client_id)
{
- parole_player = g_object_new (PAROLE_TYPE_PLAYER, "client-id", client_id, NULL);
+ parole_player = g_object_new(PAROLE_TYPE_PLAYER, "client-id", client_id, NULL);
return parole_player;
}
-ParoleMediaList *parole_player_get_media_list (ParolePlayer *player)
+ParoleMediaList *parole_player_get_media_list(ParolePlayer *player)
{
return player->priv->list;
}
-void parole_player_play_uri_disc (ParolePlayer *player, const gchar *uri, const gchar *device)
+void parole_player_play_uri_disc(ParolePlayer *player, const gchar *uri, const gchar *device)
{
if ( uri ) {
- parole_player_disc_selected_cb (NULL, uri, device, player);
+ parole_player_disc_selected_cb(NULL, uri, device, player);
} else if (device) {
- gchar *uri_local = parole_get_uri_from_unix_device (device);
+ gchar *uri_local = parole_get_uri_from_unix_device(device);
if ( uri_local ) {
- parole_player_disc_selected_cb (NULL, uri_local, device, player);
- g_free (uri_local);
+ parole_player_disc_selected_cb(NULL, uri_local, device, player);
+ g_free(uri_local);
}
}
}
@@ -3907,7 +3907,7 @@ void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player,
GList *menu_items, *menu_iter;
gint counter = 0;
- menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->languages_menu));
+ menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->languages_menu));
for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
{
@@ -3923,7 +3923,7 @@ void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player,
void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, gint sub_index)
{
GList *menu_items, *menu_iter;
- menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->subtitles_menu));
+ menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->subtitles_menu));
if (sub_index <= 0) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items->data), TRUE);
@@ -3948,7 +3948,7 @@ void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, Paro
gint counter = 0;
gint combobox_index;
- menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->languages_menu));
+ menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->languages_menu));
for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
{
@@ -3972,7 +3972,7 @@ void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, Parol
gint counter = 0;
GList *menu_items, *menu_iter;
- menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->subtitles_menu));
+ menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->subtitles_menu));
for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
{
@@ -4004,12 +4004,12 @@ void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlay
}
static gboolean
-get_has_file_extension (gchar* filename, gchar* extension)
+get_has_file_extension(gchar* filename, gchar* extension)
{
gchar *lowercase = NULL;
gboolean has_ext;
- lowercase = g_utf8_strdown (filename, g_utf8_strlen(filename, -1));
+ lowercase = g_utf8_strdown(filename, g_utf8_strlen(filename, -1));
has_ext = g_str_has_suffix(lowercase, extension);
@@ -4032,34 +4032,34 @@ void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, ParolePlaye
parole_player_set_subtitle_radio_menu_item_selected(player, sub_index);
}
-void parole_player_terminate (ParolePlayer *player)
+void parole_player_terminate(ParolePlayer *player)
{
- parole_player_delete_event_cb (NULL, NULL, player);
+ parole_player_delete_event_cb(NULL, NULL, player);
}
-static gboolean parole_player_dbus_play (ParolePlayer *player,
+static gboolean parole_player_dbus_play(ParolePlayer *player,
GError *error);
-static gboolean parole_player_dbus_next_track (ParolePlayer *player,
+static gboolean parole_player_dbus_next_track(ParolePlayer *player,
GError *error);
-static gboolean parole_player_dbus_prev_track (ParolePlayer *player,
+static gboolean parole_player_dbus_prev_track(ParolePlayer *player,
GError *error);
-static gboolean parole_player_dbus_raise_volume (ParolePlayer *player,
+static gboolean parole_player_dbus_raise_volume(ParolePlayer *player,
GError *error);
-static gboolean parole_player_dbus_lower_volume (ParolePlayer *player,
+static gboolean parole_player_dbus_lower_volume(ParolePlayer *player,
GError *error);
-static gboolean parole_player_dbus_mute (ParolePlayer *player,
+static gboolean parole_player_dbus_mute(ParolePlayer *player,
GError *error);
-static gboolean parole_player_dbus_unmute (ParolePlayer *player,
+static gboolean parole_player_dbus_unmute(ParolePlayer *player,
GError *error);
-static gboolean parole_player_dbus_play_disc (ParolePlayer *player,
+static gboolean parole_player_dbus_play_disc(ParolePlayer *player,
gchar *in_uri,
gchar *in_device,
GError **error);
@@ -4070,56 +4070,56 @@ static gboolean parole_player_dbus_play_disc (ParolePlayer *player,
* DBus server implementation
*/
static void
-parole_player_dbus_class_init (ParolePlayerClass *klass)
+parole_player_dbus_class_init(ParolePlayerClass *klass)
{
- dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
+ dbus_g_object_type_install_info(G_TYPE_FROM_CLASS(klass),
&dbus_glib_parole_player_object_info);
}
static void
-parole_player_dbus_init (ParolePlayer *player)
+parole_player_dbus_init(ParolePlayer *player)
{
- dbus_g_connection_register_g_object (player->priv->bus,
+ dbus_g_connection_register_g_object(player->priv->bus,
PAROLE_DBUS_PATH,
- G_OBJECT (player));
+ G_OBJECT(player));
}
-static gboolean parole_player_dbus_play (ParolePlayer *player,
+static gboolean parole_player_dbus_play(ParolePlayer *player,
GError *error)
{
parole_player_toggle_playpause(player);
return TRUE;
}
-static gboolean parole_player_dbus_next_track (ParolePlayer *player,
+static gboolean parole_player_dbus_next_track(ParolePlayer *player,
GError *error)
{
- parole_player_play_next (player, TRUE);
+ parole_player_play_next(player, TRUE);
return TRUE;
}
-static gboolean parole_player_dbus_prev_track (ParolePlayer *player,
+static gboolean parole_player_dbus_prev_track(ParolePlayer *player,
GError *error)
{
- parole_player_play_prev (player);
+ parole_player_play_prev(player);
return TRUE;
}
-static gboolean parole_player_dbus_raise_volume (ParolePlayer *player,
+static gboolean parole_player_dbus_raise_volume(ParolePlayer *player,
GError *error)
{
- parole_player_volume_up (NULL, player);
+ parole_player_volume_up(NULL, player);
return TRUE;
}
-static gboolean parole_player_dbus_lower_volume (ParolePlayer *player,
+static gboolean parole_player_dbus_lower_volume(ParolePlayer *player,
GError *error)
{
- parole_player_volume_down (NULL, player);
+ parole_player_volume_down(NULL, player);
return TRUE;
}
-static gboolean parole_player_dbus_mute (ParolePlayer *player,
+static gboolean parole_player_dbus_mute(ParolePlayer *player,
GError *error)
{
if (gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume)) != 0.0)
@@ -4129,7 +4129,7 @@ static gboolean parole_player_dbus_mute (ParolePlayer *player,
return TRUE;
}
-static gboolean parole_player_dbus_unmute (ParolePlayer *player,
+static gboolean parole_player_dbus_unmute(ParolePlayer *player,
GError *error)
{
if (gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume)) == 0.0)
@@ -4139,17 +4139,17 @@ static gboolean parole_player_dbus_unmute (ParolePlayer *player,
return TRUE;
}
-static gboolean parole_player_dbus_play_disc (ParolePlayer *player,
+static gboolean parole_player_dbus_play_disc(ParolePlayer *player,
gchar *in_uri,
gchar *in_device,
GError **error)
{
- TRACE ("uri : %s", in_uri);
+ TRACE("uri : %s", in_uri);
- gtk_window_present (GTK_WINDOW (player->priv->window));
+ gtk_window_present(GTK_WINDOW(player->priv->window));
if ( parole_is_uri_disc (in_uri) )
- parole_player_disc_selected_cb (NULL, in_uri, in_device, player);
+ parole_player_disc_selected_cb(NULL, in_uri, in_device, player);
return TRUE;
}
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 8916f9d..66e4f40 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -37,12 +37,12 @@
#include "gst/parole-gst.h"
-static void parole_plugin_player_iface_init (ParoleProviderPlayerIface *iface);
+static void parole_plugin_player_iface_init(ParoleProviderPlayerIface *iface);
-static void parole_plugin_player_finalize (GObject *object);
+static void parole_plugin_player_finalize(GObject *object);
#define PAROLE_PLUGIN_PLAYER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_PLUGIN_PLAYER, ParolePluginPlayerPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_PLUGIN_PLAYER, ParolePluginPlayerPrivate))
struct ParolePluginPlayerPrivate
{
@@ -57,190 +57,190 @@ struct ParolePluginPlayerPrivate
gboolean fullscreen;
};
-G_DEFINE_TYPE_WITH_CODE (ParolePluginPlayer, parole_plugin_player, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLAYER, parole_plugin_player_iface_init))
+G_DEFINE_TYPE_WITH_CODE(ParolePluginPlayer, parole_plugin_player, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLAYER, parole_plugin_player_iface_init))
static void
-parole_plugin_player_send_message (const gchar *message)
+parole_plugin_player_send_message(const gchar *message)
{
DBusGProxy *proxy;
- proxy = parole_get_proxy (PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
+ proxy = parole_get_proxy(PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
- dbus_g_proxy_call_no_reply (proxy, message,
+ dbus_g_proxy_call_no_reply(proxy, message,
G_TYPE_INVALID,
G_TYPE_INVALID);
- g_object_unref (proxy);
+ g_object_unref(proxy);
}
static GtkWidget *
-parole_plugin_player_get_main_window (ParoleProviderPlayer *provider)
+parole_plugin_player_get_main_window(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
return gtk_widget_get_toplevel (player->priv->gst);
}
static void
-parole_plugin_player_pack_widget (ParoleProviderPlayer *provider, GtkWidget *widget,
+parole_plugin_player_pack_widget(ParoleProviderPlayer *provider, GtkWidget *widget,
const gchar *title, ParolePluginContainer container_type)
{
ParolePluginPlayer *player;
ParolePluginsManager *manager;
- manager = parole_plugins_manager_get ();
- player = PAROLE_PLUGIN_PLAYER (provider);
+ manager = parole_plugins_manager_get();
+ player = PAROLE_PLUGIN_PLAYER(provider);
- g_return_if_fail (player->priv->packed == FALSE);
+ g_return_if_fail(player->priv->packed == FALSE);
player->priv->packed = TRUE;
player->priv->box = widget;
- parole_plugins_manager_pack (manager, widget, title, container_type);
+ parole_plugins_manager_pack(manager, widget, title, container_type);
}
static ParoleState
-parole_plugin_player_get_state (ParoleProviderPlayer *provider)
+parole_plugin_player_get_state(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
return parole_gst_get_state (PAROLE_GST (player->priv->gst));
}
static const ParoleStream *
-parole_plugin_player_get_stream (ParoleProviderPlayer *provider)
+parole_plugin_player_get_stream(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
return parole_gst_get_stream (PAROLE_GST (player->priv->gst));
}
static gboolean
-parole_plugin_player_play_uri (ParoleProviderPlayer *provider, const gchar *uri)
+parole_plugin_player_play_uri(ParoleProviderPlayer *provider, const gchar *uri)
{
ParoleMediaList *list;
- list = PAROLE_MEDIA_LIST (parole_media_list_get ());
- parole_media_list_open_uri (list, uri);
+ list = PAROLE_MEDIA_LIST(parole_media_list_get());
+ parole_media_list_open_uri(list, uri);
- g_object_unref (list);
+ g_object_unref(list);
return TRUE;
}
static gboolean
-parole_plugin_player_pause (ParoleProviderPlayer *provider)
+parole_plugin_player_pause(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
- parole_gst_pause (PAROLE_GST (player->priv->gst));
+ parole_gst_pause(PAROLE_GST(player->priv->gst));
return TRUE;
}
static gboolean
-parole_plugin_player_resume (ParoleProviderPlayer *provider)
+parole_plugin_player_resume(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
- parole_gst_resume (PAROLE_GST (player->priv->gst));
+ parole_gst_resume(PAROLE_GST(player->priv->gst));
return TRUE;
}
static gboolean
-parole_plugin_player_stop (ParoleProviderPlayer *provider)
+parole_plugin_player_stop(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
- parole_gst_stop (PAROLE_GST (player->priv->gst));
+ parole_gst_stop(PAROLE_GST(player->priv->gst));
return TRUE;
}
static gboolean
-parole_plugin_player_play_previous (ParoleProviderPlayer *provider)
+parole_plugin_player_play_previous(ParoleProviderPlayer *provider)
{
- parole_plugin_player_send_message ("PrevTrack");
+ parole_plugin_player_send_message("PrevTrack");
return TRUE;
}
static gboolean
-parole_plugin_player_play_next (ParoleProviderPlayer *provider)
+parole_plugin_player_play_next(ParoleProviderPlayer *provider)
{
- parole_plugin_player_send_message ("NextTrack");
+ parole_plugin_player_send_message("NextTrack");
return TRUE;
}
static gboolean
-parole_plugin_player_seek (ParoleProviderPlayer *provider, gdouble pos)
+parole_plugin_player_seek(ParoleProviderPlayer *provider, gdouble pos)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
- parole_gst_seek (PAROLE_GST (player->priv->gst), pos);
+ parole_gst_seek(PAROLE_GST(player->priv->gst), pos);
return TRUE;
}
static gdouble
-parole_plugin_player_get_stream_position (ParoleProviderPlayer *provider)
+parole_plugin_player_get_stream_position(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
gdouble position = 0;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
- position = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst));
+ position = parole_gst_get_stream_position(PAROLE_GST(player->priv->gst));
/* Return as microseconds */
return position*1000000.0;
}
-static void parole_plugin_player_open_media_chooser (ParoleProviderPlayer *provider)
+static void parole_plugin_player_open_media_chooser(ParoleProviderPlayer *provider)
{
ParoleMediaList *list;
- list = PAROLE_MEDIA_LIST (parole_media_list_get ());
- parole_media_list_open (list);
+ list = PAROLE_MEDIA_LIST(parole_media_list_get());
+ parole_media_list_open(list);
- g_object_unref (list);
+ g_object_unref(list);
}
-static GSimpleAction* parole_plugin_player_get_action (ParoleProviderPlayer *provider, ParolePlayerAction action)
+static GSimpleAction* parole_plugin_player_get_action(ParoleProviderPlayer *provider, ParolePlayerAction action)
{
return parole_player_get_action (action);
}
-static gboolean parole_plugin_player_get_fullscreen (ParoleProviderPlayer *provider)
+static gboolean parole_plugin_player_get_fullscreen(ParoleProviderPlayer *provider)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (provider);
+ player = PAROLE_PLUGIN_PLAYER(provider);
return player->priv->fullscreen;
}
-static gboolean parole_plugin_player_set_fullscreen (ParoleProviderPlayer *provider, gboolean fullscreen)
+static gboolean parole_plugin_player_set_fullscreen(ParoleProviderPlayer *provider, gboolean fullscreen)
{
GtkWidget *window;
- window = parole_plugin_player_get_main_window (provider);
+ window = parole_plugin_player_get_main_window(provider);
if (fullscreen)
gtk_window_fullscreen(GTK_WINDOW(window));
@@ -250,7 +250,7 @@ static gboolean parole_plugin_player_set_fullscreen (ParoleProviderPlayer *provi
return TRUE;
}
-static void parole_plugin_player_iface_init (ParoleProviderPlayerIface *iface)
+static void parole_plugin_player_iface_init(ParoleProviderPlayerIface *iface)
{
iface->get_main_window = parole_plugin_player_get_main_window;
iface->pack = parole_plugin_player_pack_widget;
@@ -271,26 +271,26 @@ static void parole_plugin_player_iface_init (ParoleProviderPlayerIface *iface)
}
static void
-parole_plugin_player_media_state_changed_cb (ParoleGst *gst, const ParoleStream *stream,
+parole_plugin_player_media_state_changed_cb(ParoleGst *gst, const ParoleStream *stream,
ParoleState state, ParolePluginPlayer *player)
{
- g_signal_emit_by_name (G_OBJECT (player), "state-changed", stream, state);
+ g_signal_emit_by_name(G_OBJECT(player), "state-changed", stream, state);
}
static void
-parole_plugin_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePluginPlayer *player)
+parole_plugin_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePluginPlayer *player)
{
- g_signal_emit_by_name (G_OBJECT (player), "tag-message", stream);
+ g_signal_emit_by_name(G_OBJECT(player), "tag-message", stream);
}
static void
-parole_plugin_player_media_seeked_cb (ParoleGst *gst, ParolePluginPlayer *player)
+parole_plugin_player_media_seeked_cb(ParoleGst *gst, ParolePluginPlayer *player)
{
- g_signal_emit_by_name (G_OBJECT (player), "seeked");
+ g_signal_emit_by_name(G_OBJECT(player), "seeked");
}
static gboolean
-parole_plugin_player_window_state_event (GtkWidget *widget,
+parole_plugin_player_window_state_event(GtkWidget *widget,
GdkEventWindowState *event,
ParolePluginPlayer *player)
{
@@ -302,9 +302,9 @@ parole_plugin_player_window_state_event (GtkWidget *widget,
}
static void
-parole_plugin_player_class_init (ParolePluginPlayerClass *klass)
+parole_plugin_player_class_init(ParolePluginPlayerClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_plugin_player_finalize;
@@ -312,24 +312,24 @@ parole_plugin_player_class_init (ParolePluginPlayerClass *klass)
}
static void
-parole_plugin_player_init (ParolePluginPlayer *player)
+parole_plugin_player_init(ParolePluginPlayer *player)
{
GtkWidget *window;
- player->priv = PAROLE_PLUGIN_PLAYER_GET_PRIVATE (player);
+ player->priv = PAROLE_PLUGIN_PLAYER_GET_PRIVATE(player);
- player->priv->gst = parole_gst_get ();
+ player->priv->gst = parole_gst_get();
- player->priv->state_changed = g_signal_connect (G_OBJECT (player->priv->gst), "media-state",
- G_CALLBACK (parole_plugin_player_media_state_changed_cb), player);
+ player->priv->state_changed = g_signal_connect(G_OBJECT(player->priv->gst), "media-state",
+ G_CALLBACK(parole_plugin_player_media_state_changed_cb), player);
- player->priv->tag_message = g_signal_connect (G_OBJECT (player->priv->gst), "media-tag",
- G_CALLBACK (parole_plugin_player_media_tag_cb), player);
+ player->priv->tag_message = g_signal_connect(G_OBJECT(player->priv->gst), "media-tag",
+ G_CALLBACK(parole_plugin_player_media_tag_cb), player);
- player->priv->seeked = g_signal_connect (G_OBJECT (player->priv->gst), "media-seeked",
- G_CALLBACK (parole_plugin_player_media_seeked_cb), player);
+ player->priv->seeked = g_signal_connect(G_OBJECT(player->priv->gst), "media-seeked",
+ G_CALLBACK(parole_plugin_player_media_seeked_cb), player);
player->priv->fullscreen = FALSE;
- window = GTK_WIDGET(gtk_widget_get_toplevel (player->priv->gst));
+ window = GTK_WIDGET(gtk_widget_get_toplevel(player->priv->gst));
g_signal_connect(G_OBJECT(window),
"window-state-event",
G_CALLBACK(parole_plugin_player_window_state_event),
@@ -340,36 +340,36 @@ parole_plugin_player_init (ParolePluginPlayer *player)
}
static void
-parole_plugin_player_finalize (GObject *object)
+parole_plugin_player_finalize(GObject *object)
{
ParolePluginPlayer *player;
- player = PAROLE_PLUGIN_PLAYER (object);
+ player = PAROLE_PLUGIN_PLAYER(object);
if ( G_IS_OBJECT (player->priv->gst) )
{
if (g_signal_handler_is_connected (player->priv->gst, player->priv->state_changed))
- g_signal_handler_disconnect (player->priv->gst, player->priv->state_changed);
+ g_signal_handler_disconnect(player->priv->gst, player->priv->state_changed);
if (g_signal_handler_is_connected (player->priv->gst, player->priv->tag_message))
- g_signal_handler_disconnect (player->priv->gst, player->priv->tag_message);
+ g_signal_handler_disconnect(player->priv->gst, player->priv->tag_message);
if (g_signal_handler_is_connected (player->priv->gst, player->priv->seeked))
- g_signal_handler_disconnect (player->priv->gst, player->priv->seeked);
+ g_signal_handler_disconnect(player->priv->gst, player->priv->seeked);
}
if ( player->priv->packed && GTK_IS_WIDGET (player->priv->box))
- gtk_widget_destroy (player->priv->box);
+ gtk_widget_destroy(player->priv->box);
- G_OBJECT_CLASS (parole_plugin_player_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_plugin_player_parent_class)->finalize(object);
}
ParolePluginPlayer *
-parole_plugin_player_new (void)
+parole_plugin_player_new(void)
{
ParolePluginPlayer *player = NULL;
- player = g_object_new (PAROLE_TYPE_PLUGIN_PLAYER, NULL);
+ player = g_object_new(PAROLE_TYPE_PLUGIN_PLAYER, NULL);
return player;
}
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 3154f8e..9b85145 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -73,31 +73,31 @@ typedef struct
GtkWidget *configure;
} PrefData;
-void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
+void parole_plugins_manager_pref_response_cb(GtkDialog *dialog,
gint reponse_id,
PrefData *pref);
-void parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
+void parole_plugins_manager_cell_toggled_cb(GtkCellRendererToggle *cell_renderer,
gchar *path,
PrefData *pref);
-void parole_plugins_manager_tree_cursor_changed_cb (GtkTreeView *view,
+void parole_plugins_manager_tree_cursor_changed_cb(GtkTreeView *view,
PrefData *pref);
-void parole_plugins_manager_show_configure (GtkButton *button,
+void parole_plugins_manager_show_configure(GtkButton *button,
PrefData *pref);
-void parole_plugins_manager_show_about (GtkButton *button,
+void parole_plugins_manager_show_about(GtkButton *button,
PrefData *pref);
-static void parole_plugins_manager_finalize (GObject *object);
-static void parole_plugins_manager_set_property (GObject *object,
+static void parole_plugins_manager_finalize(GObject *object);
+static void parole_plugins_manager_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
#define PAROLE_PLUGINS_MANAGER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_PLUGINS_MANAGER, ParolePluginsManagerPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_PLUGINS_MANAGER, ParolePluginsManagerPrivate))
struct ParolePluginsManagerPrivate
{
@@ -113,7 +113,7 @@ struct ParolePluginsManagerPrivate
static gpointer parole_plugins_manager_object = NULL;
-G_DEFINE_TYPE (ParolePluginsManager, parole_plugins_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParolePluginsManager, parole_plugins_manager, G_TYPE_OBJECT)
enum
{
@@ -129,7 +129,7 @@ enum
PROP_LOAD_PLUGIN
};
-void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
+void parole_plugins_manager_pref_response_cb(GtkDialog *dialog,
gint reponse_id,
PrefData *pref)
{
@@ -138,32 +138,32 @@ void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (pref->store), &iter);
valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (pref->store), &iter) )
+ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(pref->store), &iter) )
{
ParolePluginInfo *info;
- gtk_tree_model_get (GTK_TREE_MODEL (pref->store),
+ gtk_tree_model_get(GTK_TREE_MODEL(pref->store),
&iter,
COL_INFO, &info,
-1);
- g_free (info->name);
- g_free (info->authors);
- g_free (info->website);
- g_free (info->desc);
- g_free (info);
+ g_free(info->name);
+ g_free(info->authors);
+ g_free(info->website);
+ g_free(info->desc);
+ g_free(info);
}
- gtk_widget_destroy (GTK_WIDGET (dialog));
- g_free (pref);
+ gtk_widget_destroy(GTK_WIDGET(dialog));
+ g_free(pref);
}
static void
-parole_plugins_manager_get_selected_module_data (PrefData *pref, ParoleProviderModule **module, ParolePluginInfo **info)
+parole_plugins_manager_get_selected_module_data(PrefData *pref, ParoleProviderModule **module, ParolePluginInfo **info)
{
GtkTreeModel *model;
GtkTreeSelection *sel;
GtkTreeIter iter;
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (pref->view));
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(pref->view));
if ( !sel )
{
@@ -178,68 +178,68 @@ parole_plugins_manager_get_selected_module_data (PrefData *pref, ParoleProviderM
*info = NULL;
return;
}
- gtk_tree_model_get (model,
+ gtk_tree_model_get(model,
&iter,
COL_MODULE, module,
COL_INFO, info,
-1);
}
-void parole_plugins_manager_show_configure (GtkButton *button, PrefData *pref)
+void parole_plugins_manager_show_configure(GtkButton *button, PrefData *pref)
{
ParoleProviderModule *module;
ParolePluginInfo *info;
- parole_plugins_manager_get_selected_module_data (pref, &module, &info);
+ parole_plugins_manager_get_selected_module_data(pref, &module, &info);
if ( G_UNLIKELY (!module) )
return;
- parole_provider_plugin_configure (PAROLE_PROVIDER_PLUGIN (module), pref->window);
+ parole_provider_plugin_configure(PAROLE_PROVIDER_PLUGIN(module), pref->window);
}
static void
-parole_plugins_manager_save_rc (ParolePluginsManager *manager, gchar *filename, gboolean active)
+parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, gboolean active)
{
gchar **saved_plugins;
gchar **plugins_rc;
guint num = 0, i, count = 0;
- saved_plugins = parole_conf_read_entry_list (PAROLE_CONF(manager->priv->conf), "plugins");
+ saved_plugins = parole_conf_read_entry_list(PAROLE_CONF(manager->priv->conf), "plugins");
if ( saved_plugins )
- num = g_strv_length (saved_plugins);
+ num = g_strv_length(saved_plugins);
if ( active ) {
- plugins_rc = g_new0 (gchar *, num + 2);
+ plugins_rc = g_new0(gchar *, num + 2);
for ( i = 0; i < num; i++)
{
- plugins_rc[i] = g_strdup (saved_plugins[i]);
+ plugins_rc[i] = g_strdup(saved_plugins[i]);
}
- plugins_rc[num] = g_strdup (filename);
+ plugins_rc[num] = g_strdup(filename);
plugins_rc[num + 1] = NULL;
- parole_conf_write_entry_list (PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
+ parole_conf_write_entry_list(PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
} else {
- plugins_rc = g_new0 (gchar *, num + 1);
+ plugins_rc = g_new0(gchar *, num + 1);
for ( i = 0; i < num; i++)
{
- if ( g_strcmp0 (saved_plugins[i], filename) != 0 ) {
- plugins_rc[count] = g_strdup (saved_plugins[i]);
+ if ( g_strcmp0(saved_plugins[i], filename) != 0 ) {
+ plugins_rc[count] = g_strdup(saved_plugins[i]);
count++;
}
}
plugins_rc[num] = NULL;
- parole_conf_write_entry_list (PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
+ parole_conf_write_entry_list(PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
}
- g_strfreev (plugins_rc);
- g_strfreev (saved_plugins);
+ g_strfreev(plugins_rc);
+ g_strfreev(saved_plugins);
}
void
-parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
+parole_plugins_manager_cell_toggled_cb(GtkCellRendererToggle *cell_renderer,
gchar *path_str,
PrefData *pref)
{
@@ -248,11 +248,11 @@ parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
GtkTreePath *path;
gboolean active = FALSE;
- path = gtk_tree_path_new_from_string (path_str);
+ path = gtk_tree_path_new_from_string(path_str);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (pref->store), &iter, path))
{
- gtk_tree_model_get (GTK_TREE_MODEL (pref->store), &iter,
+ gtk_tree_model_get(GTK_TREE_MODEL(pref->store), &iter,
COL_ACTIVE, &active,
COL_MODULE, &module,
-1);
@@ -261,31 +261,31 @@ parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
if ( pref->manager->priv->load_plugins ) {
if ( active ) {
- g_type_module_use (G_TYPE_MODULE (module));
- if (!parole_provider_module_new_plugin (module)) {
+ g_type_module_use(G_TYPE_MODULE(module));
+ if (!parole_provider_module_new_plugin(module)) {
// If plugin loading fails...
parole_dialog_error(GTK_WINDOW(pref->window), _("Plugin failed to load"), _("Please check your installation"));
- parole_provider_module_free_plugin (module);
- g_type_module_unuse (G_TYPE_MODULE (module));
+ parole_provider_module_free_plugin(module);
+ g_type_module_unuse(G_TYPE_MODULE(module));
active = FALSE;
}
} else {
- parole_provider_module_free_plugin (module);
- g_type_module_unuse (G_TYPE_MODULE (module));
+ parole_provider_module_free_plugin(module);
+ g_type_module_unuse(G_TYPE_MODULE(module));
}
}
- gtk_list_store_set (GTK_LIST_STORE (pref->store), &iter,
+ gtk_list_store_set(GTK_LIST_STORE(pref->store), &iter,
COL_ACTIVE, active,
-1);
}
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
- parole_plugins_manager_save_rc (pref->manager, G_TYPE_MODULE (module)->name, active);
+ parole_plugins_manager_save_rc(pref->manager, G_TYPE_MODULE(module)->name, active);
}
-void parole_plugins_manager_tree_cursor_changed_cb (GtkTreeView *view,
+void parole_plugins_manager_tree_cursor_changed_cb(GtkTreeView *view,
PrefData *pref)
{
ParoleProviderModule *module;
@@ -293,94 +293,94 @@ void parole_plugins_manager_tree_cursor_changed_cb (GtkTreeView *view,
gboolean configurable = FALSE;
const gchar *site;
- parole_plugins_manager_get_selected_module_data (pref, &module, &info);
+ parole_plugins_manager_get_selected_module_data(pref, &module, &info);
if ( G_UNLIKELY (!module || !info))
return;
site = info->website;
- gtk_label_set_markup (GTK_LABEL (pref->desc), info->desc);
- gtk_label_set_markup (GTK_LABEL (pref->author), info->authors);
+ gtk_label_set_markup(GTK_LABEL(pref->desc), info->desc);
+ gtk_label_set_markup(GTK_LABEL(pref->author), info->authors);
- gtk_link_button_set_uri (GTK_LINK_BUTTON (pref->site), site);
+ gtk_link_button_set_uri(GTK_LINK_BUTTON(pref->site), site);
- gtk_widget_set_tooltip_text (pref->site, site);
+ gtk_widget_set_tooltip_text(pref->site, site);
if ( parole_provider_module_get_is_active (module) )
{
- configurable = parole_provider_plugin_get_is_configurable (PAROLE_PROVIDER_PLUGIN (module));
+ configurable = parole_provider_plugin_get_is_configurable(PAROLE_PROVIDER_PLUGIN(module));
}
- gtk_widget_set_sensitive (pref->configure, configurable);
+ gtk_widget_set_sensitive(pref->configure, configurable);
}
static void
-parole_plugins_manager_unload_all (gpointer data, gpointer user_data)
+parole_plugins_manager_unload_all(gpointer data, gpointer user_data)
{
ParoleProviderModule *module;
- module = PAROLE_PROVIDER_MODULE (data);
+ module = PAROLE_PROVIDER_MODULE(data);
if ( parole_provider_module_get_is_active (module) )
{
- parole_provider_module_free_plugin (module);
- g_type_module_unuse (G_TYPE_MODULE (data));
+ parole_provider_module_free_plugin(module);
+ g_type_module_unuse(G_TYPE_MODULE(data));
}
// g_object_unref (module);
}
static ParolePluginInfo *
-parole_plugins_manager_get_plugin_info (const gchar *desktop_file)
+parole_plugins_manager_get_plugin_info(const gchar *desktop_file)
{
ParolePluginInfo *info;
GKeyFile *file;
GError *error = NULL;
- info = g_new0 (ParolePluginInfo, 1);
+ info = g_new0(ParolePluginInfo, 1);
info->name = NULL;
info->website = NULL;
info->desc = NULL;
info->authors = NULL;
- file = g_key_file_new ();
+ file = g_key_file_new();
if ( !g_key_file_load_from_file (file, desktop_file , G_KEY_FILE_NONE, &error) )
{
- g_warning ("Error opening file : %s : %s", desktop_file, error->message);
- g_error_free (error);
+ g_warning("Error opening file : %s : %s", desktop_file, error->message);
+ g_error_free(error);
goto out;
}
- info->name = g_key_file_get_locale_string (file, "Parole Plugin", "Name", NULL, NULL);
+ info->name = g_key_file_get_locale_string(file, "Parole Plugin", "Name", NULL, NULL);
if ( !info->name )
- info->name = g_strdup (_("Unknown"));
+ info->name = g_strdup(_("Unknown"));
- info->desc = g_key_file_get_locale_string (file, "Parole Plugin", "Description", NULL, NULL);
+ info->desc = g_key_file_get_locale_string(file, "Parole Plugin", "Description", NULL, NULL);
if ( !info->desc )
- info->desc = g_strdup ("");
+ info->desc = g_strdup("");
- info->authors = g_key_file_get_string (file, "Parole Plugin", "Authors", NULL);
+ info->authors = g_key_file_get_string(file, "Parole Plugin", "Authors", NULL);
if ( !info->authors )
- info->authors = g_strdup ("");
+ info->authors = g_strdup("");
- info->website = g_key_file_get_string (file, "Parole Plugin", "Website", NULL);
+ info->website = g_key_file_get_string(file, "Parole Plugin", "Website", NULL);
if ( !info->website )
- info->website = g_strdup ("");
+ info->website = g_strdup("");
out:
- g_key_file_free (file);
+ g_key_file_free(file);
return info;
}
static void
-parole_plugins_manager_show_plugins_pref (GtkWidget *widget, ParolePluginsManager *manager)
+parole_plugins_manager_show_plugins_pref(GtkWidget *widget, ParolePluginsManager *manager)
{
GtkBuilder *builder;
GtkTreeSelection *sel;
@@ -393,176 +393,176 @@ parole_plugins_manager_show_plugins_pref (GtkWidget *widget, ParolePluginsManage
/*No plugins found*/
if ( manager->priv->array->len == 0 )
{
- parole_dialog_info (GTK_WINDOW (manager->priv->main_window),
+ parole_dialog_info(GTK_WINDOW(manager->priv->main_window),
_("No installed plugins found on this system"),
_("Please check your installation."));
return;
}
- builder = parole_builder_new_from_string (plugins_ui, plugins_ui_length);
+ builder = parole_builder_new_from_string(plugins_ui, plugins_ui_length);
- pref = g_new0 (PrefData, 1);
+ pref = g_new0(PrefData, 1);
- pref->window = GTK_WIDGET (gtk_builder_get_object (builder, "dialog"));
- pref->view = GTK_WIDGET (gtk_builder_get_object (builder, "treeview"));
+ pref->window = GTK_WIDGET(gtk_builder_get_object(builder, "dialog"));
+ pref->view = GTK_WIDGET(gtk_builder_get_object(builder, "treeview"));
pref->manager = manager;
- pref->store = GTK_LIST_STORE (gtk_builder_get_object (builder, "liststore"));
+ pref->store = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststore"));
- pref->desc = GTK_WIDGET (gtk_builder_get_object (builder, "description"));
- pref->author = GTK_WIDGET (gtk_builder_get_object (builder, "author"));
- pref->site = GTK_WIDGET (gtk_builder_get_object (builder, "sitebutton"));
- pref->configure = GTK_WIDGET (gtk_builder_get_object (builder, "configure"));
+ pref->desc = GTK_WIDGET(gtk_builder_get_object(builder, "description"));
+ pref->author = GTK_WIDGET(gtk_builder_get_object(builder, "author"));
+ pref->site = GTK_WIDGET(gtk_builder_get_object(builder, "sitebutton"));
+ pref->configure = GTK_WIDGET(gtk_builder_get_object(builder, "configure"));
- gtk_window_set_transient_for (GTK_WINDOW (pref->window),
- GTK_WINDOW (manager->priv->main_window));
+ gtk_window_set_transient_for(GTK_WINDOW(pref->window),
+ GTK_WINDOW(manager->priv->main_window));
for ( i = 0; i < manager->priv->array->len; i++)
{
ParoleProviderModule *module;
ParolePluginInfo *info;
- module = g_ptr_array_index (manager->priv->array, i);
+ module = g_ptr_array_index(manager->priv->array, i);
- info = parole_plugins_manager_get_plugin_info (module->desktop_file);
+ info = parole_plugins_manager_get_plugin_info(module->desktop_file);
- gtk_list_store_append (pref->store, &iter);
- gtk_list_store_set (pref->store, &iter,
- COL_ACTIVE, parole_provider_module_get_is_active (module),
+ gtk_list_store_append(pref->store, &iter);
+ gtk_list_store_set(pref->store, &iter,
+ COL_ACTIVE, parole_provider_module_get_is_active(module),
COL_PLUGIN, info->name,
COL_MODULE, module,
COL_INFO, info,
-1);
}
- gtk_builder_connect_signals (builder, pref);
- g_object_unref (builder);
+ gtk_builder_connect_signals(builder, pref);
+ g_object_unref(builder);
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (pref->view));
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(pref->view));
- path = gtk_tree_path_new_from_string ("0");
+ path = gtk_tree_path_new_from_string("0");
- gtk_tree_selection_select_path (sel, path);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (pref->view), path, NULL, FALSE);
- gtk_tree_path_free (path);
+ gtk_tree_selection_select_path(sel, path);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(pref->view), path, NULL, FALSE);
+ gtk_tree_path_free(path);
- gtk_widget_show_all (pref->window);
+ gtk_widget_show_all(pref->window);
}
static void
-parole_plugins_manager_set_show_tabs (GtkNotebook *nt)
+parole_plugins_manager_set_show_tabs(GtkNotebook *nt)
{
gint npages;
- npages = gtk_notebook_get_n_pages (nt);
- gtk_notebook_set_show_tabs (nt, npages > 1);
+ npages = gtk_notebook_get_n_pages(nt);
+ gtk_notebook_set_show_tabs(nt, npages > 1);
}
static void
-parole_plugins_manager_page_added_cb (GtkContainer *container, GtkWidget *widget, gpointer data)
+parole_plugins_manager_page_added_cb(GtkContainer *container, GtkWidget *widget, gpointer data)
{
- parole_plugins_manager_set_show_tabs (GTK_NOTEBOOK (container));
+ parole_plugins_manager_set_show_tabs(GTK_NOTEBOOK(container));
}
static void
-parole_plugins_manager_page_removed_cb (GtkContainer *container, GtkWidget *widget, gpointer data)
+parole_plugins_manager_page_removed_cb(GtkContainer *container, GtkWidget *widget, gpointer data)
{
- parole_plugins_manager_set_show_tabs (GTK_NOTEBOOK (container));
+ parole_plugins_manager_set_show_tabs(GTK_NOTEBOOK(container));
}
-static void parole_plugins_manager_set_property (GObject *object,
+static void parole_plugins_manager_set_property(GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
ParolePluginsManager *manager;
- manager = PAROLE_PLUGINS_MANAGER (object);
+ manager = PAROLE_PLUGINS_MANAGER(object);
switch (prop_id)
{
case PROP_LOAD_PLUGIN:
- manager->priv->load_plugins = g_value_get_boolean (value);
+ manager->priv->load_plugins = g_value_get_boolean(value);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
-static void parole_plugins_manager_get_property (GObject *object,
+static void parole_plugins_manager_get_property(GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
ParolePluginsManager *manager;
- manager = PAROLE_PLUGINS_MANAGER (object);
+ manager = PAROLE_PLUGINS_MANAGER(object);
switch (prop_id)
{
case PROP_LOAD_PLUGIN:
- g_value_set_boolean (value, manager->priv->load_plugins);
+ g_value_set_boolean(value, manager->priv->load_plugins);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static gchar *
-parole_plugins_manager_get_module_name (const gchar *desktop_file)
+parole_plugins_manager_get_module_name(const gchar *desktop_file)
{
GKeyFile *file;
GError *error = NULL;
gchar *module_name = NULL;
gchar *library_name = NULL;
- file = g_key_file_new ();
+ file = g_key_file_new();
if ( !g_key_file_load_from_file (file, desktop_file, G_KEY_FILE_NONE, &error) )
{
- g_warning ("Error opening file : %s : %s", desktop_file, error->message);
- g_error_free (error);
+ g_warning("Error opening file : %s : %s", desktop_file, error->message);
+ g_error_free(error);
goto out;
}
- module_name = g_key_file_get_string (file, "Parole Plugin", "Module", NULL);
- library_name = g_strdup_printf ("%s.%s", module_name, G_MODULE_SUFFIX);
- g_free (module_name);
+ module_name = g_key_file_get_string(file, "Parole Plugin", "Module", NULL);
+ library_name = g_strdup_printf("%s.%s", module_name, G_MODULE_SUFFIX);
+ g_free(module_name);
out:
- g_key_file_free (file);
+ g_key_file_free(file);
return library_name;
}
static void
-parole_plugins_manager_load_plugins (ParolePluginsManager *manager)
+parole_plugins_manager_load_plugins(ParolePluginsManager *manager)
{
gchar **plugins_rc;
guint len = 0, i, j;
- plugins_rc = parole_conf_read_entry_list (PAROLE_CONF(manager->priv->conf), "plugins");
+ plugins_rc = parole_conf_read_entry_list(PAROLE_CONF(manager->priv->conf), "plugins");
if ( plugins_rc && plugins_rc[0] )
- len = g_strv_length (plugins_rc);
+ len = g_strv_length(plugins_rc);
for ( j = 0; j < manager->priv->array->len; j++)
{
GTypeModule *module;
- module = g_ptr_array_index (manager->priv->array, j);
+ module = g_ptr_array_index(manager->priv->array, j);
for ( i = 0; i < len; i++)
{
if ( !g_strcmp0 (plugins_rc[i], module->name) ||
- !g_strcmp0 (plugins_rc[i], PAROLE_PROVIDER_MODULE (module)->library_name) )
+ !g_strcmp0(plugins_rc[i], PAROLE_PROVIDER_MODULE(module)->library_name) )
{
- TRACE ("Loading plugin :%s", module->name);
- if ( !g_type_module_use (module) ) {
- parole_plugins_manager_save_rc (manager, module->name, FALSE);
- g_ptr_array_remove (manager->priv->array, module);
- g_object_unref (module);
+ TRACE("Loading plugin :%s", module->name);
+ if ( !g_type_module_use(module) ) {
+ parole_plugins_manager_save_rc(manager, module->name, FALSE);
+ g_ptr_array_remove(manager->priv->array, module);
+ g_object_unref(module);
} else {
- parole_provider_module_new_plugin (PAROLE_PROVIDER_MODULE (module));
+ parole_provider_module_new_plugin(PAROLE_PROVIDER_MODULE(module));
}
break;
}
@@ -571,18 +571,18 @@ parole_plugins_manager_load_plugins (ParolePluginsManager *manager)
}
static void
-parole_plugins_manager_class_init (ParolePluginsManagerClass *klass)
+parole_plugins_manager_class_init(ParolePluginsManagerClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_plugins_manager_finalize;
object_class->set_property = parole_plugins_manager_set_property;
object_class->get_property = parole_plugins_manager_get_property;
- g_object_class_install_property (object_class,
+ g_object_class_install_property(object_class,
PROP_LOAD_PLUGIN,
- g_param_spec_boolean ("load-plugins",
+ g_param_spec_boolean("load-plugins",
NULL, NULL,
TRUE,
G_PARAM_CONSTRUCT_ONLY|
@@ -592,87 +592,87 @@ parole_plugins_manager_class_init (ParolePluginsManagerClass *klass)
}
static void
-parole_plugins_manager_init (ParolePluginsManager *manager)
+parole_plugins_manager_init(ParolePluginsManager *manager)
{
GtkBuilder *builder;
- manager->priv = PAROLE_PLUGINS_MANAGER_GET_PRIVATE (manager);
+ manager->priv = PAROLE_PLUGINS_MANAGER_GET_PRIVATE(manager);
- manager->priv->array = g_ptr_array_new ();
+ manager->priv->array = g_ptr_array_new();
- builder = parole_builder_get_main_interface ();
+ builder = parole_builder_get_main_interface();
manager->priv->load_plugins = TRUE;
- manager->priv->list_nt = GTK_WIDGET (gtk_builder_get_object (builder, "notebook-playlist"));
- manager->priv->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main-window"));
+ manager->priv->list_nt = GTK_WIDGET(gtk_builder_get_object(builder, "notebook-playlist"));
+ manager->priv->main_window = GTK_WIDGET(gtk_builder_get_object(builder, "main-window"));
manager->priv->conf = parole_conf_new();
- g_signal_connect (manager->priv->list_nt, "page-added",
- G_CALLBACK (parole_plugins_manager_page_added_cb), NULL);
+ g_signal_connect(manager->priv->list_nt, "page-added",
+ G_CALLBACK(parole_plugins_manager_page_added_cb), NULL);
- g_signal_connect (manager->priv->list_nt, "page-removed",
- G_CALLBACK (parole_plugins_manager_page_removed_cb), NULL);
+ g_signal_connect(manager->priv->list_nt, "page-removed",
+ G_CALLBACK(parole_plugins_manager_page_removed_cb), NULL);
- g_signal_connect (gtk_builder_get_object (builder, "plugins-menu-item"), "activate",
- G_CALLBACK (parole_plugins_manager_show_plugins_pref), manager);
+ g_signal_connect(gtk_builder_get_object(builder, "plugins-menu-item"), "activate",
+ G_CALLBACK(parole_plugins_manager_show_plugins_pref), manager);
- parole_plugins_manager_set_show_tabs (GTK_NOTEBOOK (manager->priv->list_nt));
+ parole_plugins_manager_set_show_tabs(GTK_NOTEBOOK(manager->priv->list_nt));
- g_object_unref (builder);
+ g_object_unref(builder);
}
static void
-parole_plugins_manager_finalize (GObject *object)
+parole_plugins_manager_finalize(GObject *object)
{
ParolePluginsManager *manager;
- manager = PAROLE_PLUGINS_MANAGER (object);
+ manager = PAROLE_PLUGINS_MANAGER(object);
- g_ptr_array_foreach (manager->priv->array,
+ g_ptr_array_foreach(manager->priv->array,
(GFunc)parole_plugins_manager_unload_all, NULL);
- g_ptr_array_free (manager->priv->array, TRUE);
+ g_ptr_array_free(manager->priv->array, TRUE);
- G_OBJECT_CLASS (parole_plugins_manager_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_plugins_manager_parent_class)->finalize(object);
}
ParolePluginsManager *
-parole_plugins_manager_new (gboolean load_plugins)
+parole_plugins_manager_new(gboolean load_plugins)
{
- if ( G_LIKELY (parole_plugins_manager_object != NULL) ) {
- g_object_ref (parole_plugins_manager_object);
+ if ( G_LIKELY(parole_plugins_manager_object != NULL) ) {
+ g_object_ref(parole_plugins_manager_object);
} else {
- parole_plugins_manager_object = g_object_new (PAROLE_TYPE_PLUGINS_MANAGER,
+ parole_plugins_manager_object = g_object_new(PAROLE_TYPE_PLUGINS_MANAGER,
"load-plugins", load_plugins,
NULL);
- g_object_add_weak_pointer (parole_plugins_manager_object, &parole_plugins_manager_object);
+ g_object_add_weak_pointer(parole_plugins_manager_object, &parole_plugins_manager_object);
}
return PAROLE_PLUGINS_MANAGER (parole_plugins_manager_object);
}
ParolePluginsManager *
-parole_plugins_manager_get (void)
+parole_plugins_manager_get(void)
{
if ( G_UNLIKELY (parole_plugins_manager_object == NULL ) )
- g_error ("Plugins Manager is NULL");
+ g_error("Plugins Manager is NULL");
return PAROLE_PLUGINS_MANAGER (parole_plugins_manager_object);
}
-void parole_plugins_manager_load (ParolePluginsManager *manager)
+void parole_plugins_manager_load(ParolePluginsManager *manager)
{
GDir *dir;
GError *error = NULL;
const gchar *name;
- dir = g_dir_open (PAROLE_PLUGINS_DATA_DIR, 0, &error);
+ dir = g_dir_open(PAROLE_PLUGINS_DATA_DIR, 0, &error);
if ( error )
{
- g_debug ("No installed plugins found");
- g_error_free (error);
+ g_debug("No installed plugins found");
+ g_error_free(error);
return;
}
@@ -681,42 +681,42 @@ void parole_plugins_manager_load (ParolePluginsManager *manager)
gchar *library_name;
gchar *desktop_file;
- desktop_file = g_build_filename (PAROLE_PLUGINS_DATA_DIR, name, NULL);
- library_name = parole_plugins_manager_get_module_name (desktop_file);
+ desktop_file = g_build_filename(PAROLE_PLUGINS_DATA_DIR, name, NULL);
+ library_name = parole_plugins_manager_get_module_name(desktop_file);
if ( library_name )
{
ParoleProviderModule *module;
gchar *library_path;
- library_path = g_build_filename (PAROLE_PLUGINS_DIR, library_name, NULL);
+ library_path = g_build_filename(PAROLE_PLUGINS_DIR, library_name, NULL);
if ( !g_file_test (library_path, G_FILE_TEST_EXISTS) )
{
- g_debug ("Desktop file found '%s' but no plugin installed", library_path);
- g_free (library_path);
+ g_debug("Desktop file found '%s' but no plugin installed", library_path);
+ g_free(library_path);
continue;
}
- TRACE ("Creating a module for %s desktop file %s", library_path, desktop_file);
- module = parole_provider_module_new (library_path, desktop_file, library_name);
- g_ptr_array_add (manager->priv->array, module);
+ TRACE("Creating a module for %s desktop file %s", library_path, desktop_file);
+ module = parole_provider_module_new(library_path, desktop_file, library_name);
+ g_ptr_array_add(manager->priv->array, module);
- g_free (library_name);
- g_free (library_path);
+ g_free(library_name);
+ g_free(library_path);
}
- g_free (desktop_file);
+ g_free(desktop_file);
}
- g_dir_close (dir);
+ g_dir_close(dir);
if ( manager->priv->load_plugins )
- parole_plugins_manager_load_plugins (manager);
+ parole_plugins_manager_load_plugins(manager);
}
void
-parole_plugins_manager_pack (ParolePluginsManager *manager, GtkWidget *widget, const gchar *title, ParolePluginContainer container)
+parole_plugins_manager_pack(ParolePluginsManager *manager, GtkWidget *widget, const gchar *title, ParolePluginContainer container)
{
if ( container == PAROLE_PLUGIN_CONTAINER_PLAYLIST )
{
- gtk_notebook_append_page (GTK_NOTEBOOK (manager->priv->list_nt), widget, gtk_label_new (title));
- gtk_widget_show_all (widget);
+ gtk_notebook_append_page(GTK_NOTEBOOK(manager->priv->list_nt), widget, gtk_label_new(title));
+ gtk_widget_show_all(widget);
}
}
diff --git a/src/parole-shortcuts.c b/src/parole-shortcuts.c
index 7ac348f..fe0430e 100644
--- a/src/parole-shortcuts.c
+++ b/src/parole-shortcuts.c
@@ -34,7 +34,7 @@
#include "interfaces/shortcuts_ui.h"
-static void parole_shortcuts_finalize (GObject *object);
+static void parole_shortcuts_finalize(GObject *object);
struct ParoleShortcuts
{
@@ -46,7 +46,7 @@ struct ParoleShortcutsClass
GObjectClass parent_class;
};
-G_DEFINE_TYPE (ParoleShortcuts, parole_shortcuts, G_TYPE_OBJECT)
+G_DEFINE_TYPE(ParoleShortcuts, parole_shortcuts, G_TYPE_OBJECT)
/*
static void
@@ -57,49 +57,49 @@ parole_shortcuts_close_cb (GtkShortcutsWindow *window, ParoleShortcuts *self)
*/
static void
-parole_shortcuts_class_init (ParoleShortcutsClass *klass)
+parole_shortcuts_class_init(ParoleShortcutsClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_shortcuts_finalize;
}
static void
-parole_shortcuts_init (ParoleShortcuts *self)
+parole_shortcuts_init(ParoleShortcuts *self)
{
}
static void
-parole_shortcuts_finalize (GObject *object)
+parole_shortcuts_finalize(GObject *object)
{
- G_OBJECT_CLASS (parole_shortcuts_parent_class)->finalize (object);
+ G_OBJECT_CLASS(parole_shortcuts_parent_class)->finalize(object);
}
-ParoleShortcuts *parole_shortcuts (GtkWidget *parent)
+ParoleShortcuts *parole_shortcuts(GtkWidget *parent)
{
ParoleShortcuts *self;
GtkWidget *window;
GtkBuilder *builder;
- self = g_object_new (PAROLE_TYPE_SHORTCUTS, NULL);
+ self = g_object_new(PAROLE_TYPE_SHORTCUTS, NULL);
- builder = parole_builder_new_from_string (shortcuts_ui, shortcuts_ui_length);
+ builder = parole_builder_new_from_string(shortcuts_ui, shortcuts_ui_length);
- window = GTK_WIDGET (gtk_builder_get_object (builder, "shortcuts"));
+ window = GTK_WIDGET(gtk_builder_get_object(builder, "shortcuts"));
if ( parent )
- gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (parent));
+ gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent));
- gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER_ON_PARENT);
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER_ON_PARENT);
- g_signal_connect (window, "delete-event",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect(window, "delete-event",
+ G_CALLBACK(gtk_widget_destroy), NULL);
- g_signal_connect (window, "close",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect(window, "close",
+ G_CALLBACK(gtk_widget_destroy), NULL);
- gtk_widget_show_all (window);
- g_object_unref (builder);
+ gtk_widget_show_all(window);
+ g_object_unref(builder);
return self;
}
diff --git a/src/parole-subtitle-encoding.c b/src/parole-subtitle-encoding.c
index 1a4c48b..37e2b72 100644
--- a/src/parole-subtitle-encoding.c
+++ b/src/parole-subtitle-encoding.c
@@ -341,7 +341,7 @@ static SubtitleEncoding encodings[] = {
};
static const SubtitleEncoding *
-find_encoding_by_charset (const char *charset)
+find_encoding_by_charset(const char *charset)
{
int i;
@@ -361,14 +361,14 @@ find_encoding_by_charset (const char *charset)
}
static void
-subtitle_encoding_init (void)
+subtitle_encoding_init(void)
{
guint i;
- g_get_charset ((const char **)
+ g_get_charset((const char **)
&encodings[SUBTITLE_ENCODING_CURRENT_LOCALE].charset);
- g_assert (G_N_ELEMENTS (encodings) == SUBTITLE_ENCODING_LAST);
+ g_assert(G_N_ELEMENTS(encodings) == SUBTITLE_ENCODING_LAST);
for (i = 0; i < SUBTITLE_ENCODING_LAST; i++) {
/* Translate the names */
@@ -377,11 +377,11 @@ subtitle_encoding_init (void)
}
static int
-subtitle_encoding_get_index (const char *charset)
+subtitle_encoding_get_index(const char *charset)
{
const SubtitleEncoding *e;
- e = find_encoding_by_charset (charset);
+ e = find_encoding_by_charset(charset);
if (e != NULL)
return e->index;
else
@@ -389,7 +389,7 @@ subtitle_encoding_get_index (const char *charset)
}
static const char *
-subtitle_encoding_get_charset (int index_i)
+subtitle_encoding_get_charset(int index_i)
{
const SubtitleEncoding *e;
@@ -409,35 +409,35 @@ enum
};
static gint
-compare (GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer data)
+compare(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer data)
{
gchar *str_a, *str_b;
gint result;
- gtk_tree_model_get (model, a, NAME_COL, &str_a, -1);
- gtk_tree_model_get (model, b, NAME_COL, &str_b, -1);
+ gtk_tree_model_get(model, a, NAME_COL, &str_a, -1);
+ gtk_tree_model_get(model, b, NAME_COL, &str_b, -1);
- result = strcmp (str_a, str_b);
+ result = strcmp(str_a, str_b);
- g_free (str_a);
- g_free (str_b);
+ g_free(str_a);
+ g_free(str_b);
return result;
}
static void
-is_encoding_sensitive (GtkCellLayout * cell_layout,
+is_encoding_sensitive(GtkCellLayout * cell_layout,
GtkCellRenderer * cell,
GtkTreeModel * tree_model, GtkTreeIter * iter, gpointer data)
{
gboolean sensitive;
- sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
- g_object_set (cell, "sensitive", sensitive, NULL);
+ sensitive = !gtk_tree_model_iter_has_child(tree_model, iter);
+ g_object_set(cell, "sensitive", sensitive, NULL);
}
static GtkTreeModel *
-subtitle_encoding_create_store (void)
+subtitle_encoding_create_store(void)
{
gchar *label;
gchar *lastlang = "";
@@ -445,51 +445,51 @@ subtitle_encoding_create_store (void)
GtkTreeStore *store;
int i;
- store = gtk_tree_store_new (2, G_TYPE_INT, G_TYPE_STRING);
+ store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING);
for (i = 0; i < SUBTITLE_ENCODING_LAST; i++) {
- if (strcmp (lastlang, encodings[i].name)) {
+ if (strcmp(lastlang, encodings[i].name)) {
lastlang = g_strdup(encodings[i].name);
- gtk_tree_store_append (store, &iter, NULL);
- gtk_tree_store_set (store, &iter, INDEX_COL,
+ gtk_tree_store_append(store, &iter, NULL);
+ gtk_tree_store_set(store, &iter, INDEX_COL,
-1, NAME_COL, lastlang, -1);
}
label = g_strdup_printf("%s (%s)", lastlang, encodings[i].charset);
- gtk_tree_store_append (store, &iter2, &iter);
- gtk_tree_store_set (store, &iter2, INDEX_COL,
+ gtk_tree_store_append(store, &iter2, &iter);
+ gtk_tree_store_set(store, &iter2, INDEX_COL,
encodings[i].index, NAME_COL, label, -1);
g_free(label);
}
- gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
+ gtk_tree_sortable_set_default_sort_func(GTK_TREE_SORTABLE(store),
compare, NULL, NULL);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store),
NAME_COL, GTK_SORT_ASCENDING);
return GTK_TREE_MODEL (store);
}
static void
-subtitle_encoding_combo_render (GtkComboBox * combo)
+subtitle_encoding_combo_render(GtkComboBox * combo)
{
GtkCellRenderer *renderer;
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer,
"text", NAME_COL, NULL);
- gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
+ gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo),
renderer, is_encoding_sensitive, NULL, NULL);
}
const char *
-parole_subtitle_encoding_get_selected (GtkComboBox * combo)
+parole_subtitle_encoding_get_selected(GtkComboBox * combo)
{
GtkTreeModel *model;
GtkTreeIter iter;
gint index_i = -1;
- model = gtk_combo_box_get_model (combo);
- if (gtk_combo_box_get_active_iter (combo, &iter)) {
- gtk_tree_model_get (model, &iter, INDEX_COL, &index_i, -1);
+ model = gtk_combo_box_get_model(combo);
+ if (gtk_combo_box_get_active_iter(combo, &iter)) {
+ gtk_tree_model_get(model, &iter, INDEX_COL, &index_i, -1);
}
if (index_i == -1)
return NULL;
@@ -498,16 +498,16 @@ parole_subtitle_encoding_get_selected (GtkComboBox * combo)
}
void
-parole_subtitle_encoding_set (GtkComboBox * combo, const char *encoding)
+parole_subtitle_encoding_set(GtkComboBox * combo, const char *encoding)
{
GtkTreeModel *model;
GtkTreeIter iter, iter2;
gint index_i, i;
- g_return_if_fail (encoding != NULL);
+ g_return_if_fail(encoding != NULL);
- model = gtk_combo_box_get_model (combo);
- index_i = subtitle_encoding_get_index (encoding);
+ model = gtk_combo_box_get_model(combo);
+ index_i = subtitle_encoding_get_index(encoding);
if (gtk_tree_model_get_iter_first (model, &iter))
{
@@ -517,26 +517,26 @@ parole_subtitle_encoding_set (GtkComboBox * combo, const char *encoding)
if (!gtk_tree_model_iter_children (model, &iter2, &iter))
continue;
do {
- gtk_tree_model_get (model, &iter2, INDEX_COL, &i, -1);
+ gtk_tree_model_get(model, &iter2, INDEX_COL, &i, -1);
if (i == index_i)
break;
- } while (gtk_tree_model_iter_next (model, &iter2));
+ } while (gtk_tree_model_iter_next(model, &iter2));
if (i == index_i)
break;
- } while (gtk_tree_model_iter_next (model, &iter));
- gtk_combo_box_set_active_iter (combo, &iter2);
+ } while (gtk_tree_model_iter_next(model, &iter));
+ gtk_combo_box_set_active_iter(combo, &iter2);
}
}
void
-parole_subtitle_encoding_init (GtkComboBox *combo)
+parole_subtitle_encoding_init(GtkComboBox *combo)
{
GtkTreeModel *model;
- subtitle_encoding_init ();
- model = subtitle_encoding_create_store ();
- gtk_combo_box_set_model (combo, model);
- g_object_unref (model);
- subtitle_encoding_combo_render (combo);
+ subtitle_encoding_init();
+ model = subtitle_encoding_create_store();
+ gtk_combo_box_set_model(combo, model);
+ g_object_unref(model);
+ subtitle_encoding_combo_render(combo);
}
/*
diff --git a/src/parole-utils.c b/src/parole-utils.c
index 8ea7e1c..af51728 100644
--- a/src/parole-utils.c
+++ b/src/parole-utils.c
@@ -68,15 +68,15 @@ static const char subtitle_ext[][4] = {
*
*/
static gint
-compare_by_name_using_number (const gchar *ap,
+compare_by_name_using_number(const gchar *ap,
const gchar *bp)
{
guint anum;
guint bnum;
/* determine the numbers in ap and bp */
- anum = strtoul (ap, NULL, 10);
- bnum = strtoul (bp, NULL, 10);
+ anum = strtoul(ap, NULL, 10);
+ bnum = strtoul(bp, NULL, 10);
/* compare the numbers */
if (anum < bnum)
@@ -98,7 +98,7 @@ compare_by_name_using_number (const gchar *ap,
*
*/
gint
-thunar_file_compare_by_name (ParoleFile *file_a,
+thunar_file_compare_by_name(ParoleFile *file_a,
ParoleFile *file_b,
gboolean case_sensitive)
{
@@ -109,11 +109,11 @@ thunar_file_compare_by_name (ParoleFile *file_a,
/* we compare only the display names (UTF-8!) */
- ap = parole_file_get_display_name (file_a);
- bp = parole_file_get_display_name (file_b);
+ ap = parole_file_get_display_name(file_a);
+ bp = parole_file_get_display_name(file_b);
/* check if we should ignore case */
- if (G_LIKELY (case_sensitive)) {
+ if (G_LIKELY(case_sensitive)) {
/* try simple (fast) ASCII comparison first */
for (;; ++ap, ++bp)
{
@@ -125,12 +125,12 @@ thunar_file_compare_by_name (ParoleFile *file_a,
}
/* fallback to Unicode comparison */
- if (G_UNLIKELY (ac > 127 || bc > 127)) {
+ if (G_UNLIKELY(ac > 127 || bc > 127)) {
for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
{
/* check if characters differ or end of string */
- ac = g_utf8_get_char (ap);
- bc = g_utf8_get_char (bp);
+ ac = g_utf8_get_char(ap);
+ bc = g_utf8_get_char(bp);
if (ac != bc || ac == 0)
break;
}
@@ -147,12 +147,12 @@ thunar_file_compare_by_name (ParoleFile *file_a,
}
/* fallback to Unicode comparison (case-insensitive!) */
- if (G_UNLIKELY (ac > 127 || bc > 127)) {
+ if (G_UNLIKELY(ac > 127 || bc > 127)) {
for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
{
/* check if characters differ or end of string */
- ac = g_utf8_get_char (ap);
- bc = g_utf8_get_char (bp);
+ ac = g_utf8_get_char(ap);
+ bc = g_utf8_get_char(bp);
if (g_unichar_tolower (ac) != g_unichar_tolower (bc) || ac == 0)
break;
}
@@ -176,7 +176,7 @@ thunar_file_compare_by_name (ParoleFile *file_a,
* makes sense, if the previous char for both strings is a digit.
*/
if (ap > parole_file_get_display_name (file_a) && bp > parole_file_get_display_name (file_b)
- && g_ascii_isdigit (*(ap - 1)) && g_ascii_isdigit (*(bp - 1)))
+ && g_ascii_isdigit(*(ap - 1)) && g_ascii_isdigit(*(bp - 1)))
{
return compare_by_name_using_number (ap - 1, bp - 1);
}
@@ -188,11 +188,11 @@ thunar_file_compare_by_name (ParoleFile *file_a,
* would be too expensive)
*/
#ifdef HAVE_STRCOLL
- if ((ac > 127 || bc > 127) && g_get_charset (NULL)) {
+ if ((ac > 127 || bc > 127) && g_get_charset(NULL)) {
/* case-sensitive is easy, case-insensitive is expensive,
* but we use a simple optimization to make it fast.
*/
- if (G_LIKELY (case_sensitive)) {
+ if (G_LIKELY(case_sensitive)) {
return strcoll (ap, bp);
} else {
/* we use a trick here, so we don't need to allocate
@@ -206,8 +206,8 @@ thunar_file_compare_by_name (ParoleFile *file_a,
/* transform the unicode chars to strings and
* make sure the strings are nul-terminated.
*/
- abuf[g_unichar_to_utf8 (ac, abuf)] = '\0';
- bbuf[g_unichar_to_utf8 (bc, bbuf)] = '\0';
+ abuf[g_unichar_to_utf8(ac, abuf)] = '\0';
+ bbuf[g_unichar_to_utf8(bc, bbuf)] = '\0';
/* compare the unicode chars (as strings) */
return strcoll (abuf, bbuf);
@@ -223,12 +223,12 @@ thunar_file_compare_by_name (ParoleFile *file_a,
}
gchar *
-parole_get_name_without_extension (const gchar *name)
+parole_get_name_without_extension(const gchar *name)
{
guint len, suffix;
gchar *ret;
- len = strlen (name);
+ len = strlen(name);
for ( suffix = len -1; suffix > 0; suffix--)
{
@@ -241,31 +241,31 @@ parole_get_name_without_extension (const gchar *name)
}
static gchar *
-parole_get_subtitle_in_dir (const gchar *dir_path, const gchar *file)
+parole_get_subtitle_in_dir(const gchar *dir_path, const gchar *file)
{
gchar *sub_path = NULL;
gchar *file_no_ext;
guint i;
- file_no_ext = parole_get_name_without_extension (file);
+ file_no_ext = parole_get_name_without_extension(file);
for ( i = 0; i < G_N_ELEMENTS (subtitle_ext); i++)
{
- sub_path = g_strdup_printf ("%s%c%s.%s", dir_path, G_DIR_SEPARATOR, file_no_ext, subtitle_ext[i]);
+ sub_path = g_strdup_printf("%s%c%s.%s", dir_path, G_DIR_SEPARATOR, file_no_ext, subtitle_ext[i]);
if ( g_file_test (sub_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) )
break;
- g_free (sub_path);
+ g_free(sub_path);
sub_path = NULL;
}
- g_free (file_no_ext);
+ g_free(file_no_ext);
return sub_path;
}
-gchar *parole_get_subtitle_path (const gchar *uri)
+gchar *parole_get_subtitle_path(const gchar *uri)
{
GFile *file, *parent;
GFileInfo *info;
@@ -274,18 +274,18 @@ gchar *parole_get_subtitle_path (const gchar *uri)
gchar *file_name;
gchar *ret = NULL;
- file = g_file_new_for_commandline_arg (uri);
- parent = g_file_get_parent (file);
+ file = g_file_new_for_commandline_arg(uri);
+ parent = g_file_get_parent(file);
- TRACE ("uri : %s", uri);
+ TRACE("uri : %s", uri);
if ( !parent )
{
- g_object_unref (file);
+ g_object_unref(file);
return NULL;
}
- info = g_file_query_info (file,
+ info = g_file_query_info(file,
"standard::*,",
0,
NULL,
@@ -293,43 +293,43 @@ gchar *parole_get_subtitle_path (const gchar *uri)
if ( error )
{
- g_warning ("%s: \n", error->message);
- g_error_free (error);
+ g_warning("%s: \n", error->message);
+ g_error_free(error);
return NULL;
}
- file_name = g_strdup (g_file_info_get_display_name (info));
+ file_name = g_strdup(g_file_info_get_display_name(info));
- path = g_file_get_path (parent);
+ path = g_file_get_path(parent);
- ret = parole_get_subtitle_in_dir (path, file_name);
+ ret = parole_get_subtitle_in_dir(path, file_name);
- g_object_unref (file);
- g_object_unref (parent);
- g_object_unref (info);
+ g_object_unref(file);
+ g_object_unref(parent);
+ g_object_unref(info);
- g_free (file_name);
- g_free (path);
+ g_free(file_name);
+ g_free(path);
return ret;
}
gboolean
-parole_is_uri_disc (const gchar *uri)
+parole_is_uri_disc(const gchar *uri)
{
if ( g_str_has_prefix (uri, "dvd:/") || g_str_has_prefix (uri, "vcd:/")
- || g_str_has_prefix (uri, "svcd:/") || g_str_has_prefix (uri, "cdda:/"))
+ || g_str_has_prefix(uri, "svcd:/") || g_str_has_prefix(uri, "cdda:/"))
return TRUE;
else
return FALSE;
}
-GdkPixbuf *parole_icon_load (const gchar *icon_name, gint size)
+GdkPixbuf *parole_icon_load(const gchar *icon_name, gint size)
{
GdkPixbuf *pix = NULL;
GError *error = NULL;
- pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
icon_name,
size,
GTK_ICON_LOOKUP_USE_BUILTIN,
@@ -337,14 +337,14 @@ GdkPixbuf *parole_icon_load (const gchar *icon_name, gint size)
if ( error )
{
- g_warning ("Unable to load icon : %s : %s", icon_name, error->message);
- g_error_free (error);
+ g_warning("Unable to load icon : %s : %s", icon_name, error->message);
+ g_error_free(error);
}
return pix;
}
-void parole_get_media_files (GtkFileFilter *filter, const gchar *path,
+void parole_get_media_files(GtkFileFilter *filter, const gchar *path,
gboolean recursive, GSList **list)
{
GtkFileFilter *playlist_filter;
@@ -354,61 +354,61 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path,
const gchar *name;
ParoleFile *file;
- playlist_filter = parole_get_supported_playlist_filter ();
- g_object_ref_sink (playlist_filter);
+ playlist_filter = parole_get_supported_playlist_filter();
+ g_object_ref_sink(playlist_filter);
- gtk_main_iteration_do (FALSE);
+ gtk_main_iteration_do(FALSE);
- if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
- file = parole_file_new (path);
+ if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) {
+ file = parole_file_new(path);
if ( parole_file_filter (playlist_filter, file) &&
- parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN )
+ parole_pl_parser_guess_format_from_extension(path) != PAROLE_PL_FORMAT_UNKNOWN )
{
- playlist = parole_pl_parser_parse_from_file_by_extension (path);
- g_object_unref (file);
+ playlist = parole_pl_parser_parse_from_file_by_extension(path);
+ g_object_unref(file);
if (playlist) {
- *list = g_slist_concat (*list, playlist);
+ *list = g_slist_concat(*list, playlist);
}
- } else if (parole_file_filter (filter, file)) {
- *list = g_slist_append (*list, file);
+ } else if (parole_file_filter(filter, file)) {
+ *list = g_slist_append(*list, file);
} else {
- g_object_unref (file);
+ g_object_unref(file);
}
- } else if (g_file_test (path, G_FILE_TEST_IS_DIR)) {
- dir = g_dir_open (path, 0, NULL);
+ } else if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
+ dir = g_dir_open(path, 0, NULL);
if ( G_UNLIKELY (dir == NULL) )
return;
while ((name = g_dir_read_name (dir)))
{
- gchar *path_internal = g_build_filename (path, name, NULL);
- if (g_file_test (path_internal, G_FILE_TEST_IS_DIR) && recursive) {
- parole_get_media_files (filter, path_internal, TRUE, list);
- } else if ( g_file_test (path_internal, G_FILE_TEST_IS_REGULAR) ) {
- file = parole_file_new (path_internal);
+ gchar *path_internal = g_build_filename(path, name, NULL);
+ if (g_file_test(path_internal, G_FILE_TEST_IS_DIR) && recursive) {
+ parole_get_media_files(filter, path_internal, TRUE, list);
+ } else if ( g_file_test(path_internal, G_FILE_TEST_IS_REGULAR) ) {
+ file = parole_file_new(path_internal);
if (parole_file_filter (playlist_filter, file) &&
- parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN)
+ parole_pl_parser_guess_format_from_extension(path) != PAROLE_PL_FORMAT_UNKNOWN)
{
- playlist = parole_pl_parser_parse_from_file_by_extension (path_internal);
- g_object_unref (file);
+ playlist = parole_pl_parser_parse_from_file_by_extension(path_internal);
+ g_object_unref(file);
if (playlist) {
- *list = g_slist_concat (*list, playlist);
+ *list = g_slist_concat(*list, playlist);
}
- } else if ( parole_file_filter (filter, file) ) {
- list_internal = g_slist_append (list_internal, file);
+ } else if ( parole_file_filter(filter, file) ) {
+ list_internal = g_slist_append(list_internal, file);
} else {
- g_object_unref (file);
+ g_object_unref(file);
}
}
- g_free (path_internal);
+ g_free(path_internal);
}
- list_internal = g_slist_sort (list_internal, (GCompareFunc) thunar_file_compare_by_name);
- g_dir_close (dir);
- *list = g_slist_concat (*list, list_internal);
+ list_internal = g_slist_sort(list_internal, (GCompareFunc)thunar_file_compare_by_name);
+ g_dir_close(dir);
+ *list = g_slist_concat(*list, list_internal);
}
- g_object_unref (playlist_filter);
+ g_object_unref(playlist_filter);
}
/***
@@ -418,7 +418,7 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path,
gboolean
-parole_device_has_cdda (const gchar *device)
+parole_device_has_cdda(const gchar *device)
{
gboolean ret_val = FALSE;
@@ -426,18 +426,18 @@ parole_device_has_cdda (const gchar *device)
gint fd;
gint drive;
- TRACE ("device : %s", device);
+ TRACE("device : %s", device);
- if ( (fd = open (device, O_RDONLY)) < 0 ) {
- g_debug ("Failed to open device : %s", device);
+ if ((fd = open(device, O_RDONLY)) < 0) {
+ g_debug("Failed to open device : %s", device);
return FALSE;
}
- if ( (drive = ioctl (fd, CDROM_DRIVE_STATUS, NULL)) ) {
+ if ((drive = ioctl(fd, CDROM_DRIVE_STATUS, NULL))) {
if ( drive == CDS_DRIVE_NOT_READY ) {
- g_debug ("Drive :%s is not yet ready\n", device);
+ g_debug("Drive :%s is not yet ready\n", device);
} else if ( drive == CDS_DISC_OK ) {
- if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) > 0 ) {
+ if ((drive = ioctl(fd, CDROM_DISC_STATUS, NULL)) > 0) {
if ( drive == CDS_AUDIO ) {
ret_val = TRUE;
}
@@ -445,61 +445,61 @@ parole_device_has_cdda (const gchar *device)
}
}
- close (fd);
+ close(fd);
#endif /* if defined(__linux__) */
return ret_val;
}
gchar *
-parole_guess_uri_from_mount (GMount *mount)
+parole_guess_uri_from_mount(GMount *mount)
{
GFile *file;
gchar *uri = NULL;
- g_return_val_if_fail (G_IS_MOUNT (mount), NULL);
+ g_return_val_if_fail(G_IS_MOUNT(mount), NULL);
- file = g_mount_get_root (mount);
+ file = g_mount_get_root(mount);
- if ( g_file_has_uri_scheme (file, "cdda") ) {
- uri = g_strdup ("cdda://");
+ if ( g_file_has_uri_scheme(file, "cdda") ) {
+ uri = g_strdup("cdda://");
} else {
gchar **content_type;
int i;
- content_type = g_content_type_guess_for_tree (file);
+ content_type = g_content_type_guess_for_tree(file);
for ( i = 0; content_type && content_type[i]; i++)
{
- TRACE ("Checking disc content type : %s", content_type[i]);
+ TRACE("Checking disc content type : %s", content_type[i]);
- if ( !g_strcmp0 (content_type[i], "x-content/video-dvd") ) {
- uri = g_strdup ("dvd:/");
+ if ( !g_strcmp0(content_type[i], "x-content/video-dvd") ) {
+ uri = g_strdup("dvd:/");
break;
- } else if ( !g_strcmp0 (content_type[i], "x-content/video-vcd") ) {
- uri = g_strdup ("vcd:/");
+ } else if ( !g_strcmp0(content_type[i], "x-content/video-vcd") ) {
+ uri = g_strdup("vcd:/");
break;
- } else if ( !g_strcmp0 (content_type[i], "x-content/video-svcd") ) {
- uri = g_strdup ("svcd:/");
+ } else if ( !g_strcmp0(content_type[i], "x-content/video-svcd") ) {
+ uri = g_strdup("svcd:/");
break;
- } else if ( !g_strcmp0 (content_type[i], "x-content/audio-cdda") ) {
- uri = g_strdup ("cdda://");
+ } else if ( !g_strcmp0(content_type[i], "x-content/audio-cdda") ) {
+ uri = g_strdup("cdda://");
break;
}
}
if ( content_type )
- g_strfreev (content_type);
+ g_strfreev(content_type);
}
- g_object_unref (file);
+ g_object_unref(file);
- TRACE ("Got uri=%s for mount=%s", uri, g_mount_get_name (mount));
+ TRACE("Got uri=%s for mount=%s", uri, g_mount_get_name(mount));
return uri;
}
gchar *
-parole_get_uri_from_unix_device (const gchar *device)
+parole_get_uri_from_unix_device(const gchar *device)
{
GVolumeMonitor *monitor;
GList *list;
@@ -516,52 +516,52 @@ parole_get_uri_from_unix_device (const gchar *device)
return g_strdup ("cdda://");
}
- monitor = g_volume_monitor_get ();
+ monitor = g_volume_monitor_get();
- list = g_volume_monitor_get_volumes (monitor);
+ list = g_volume_monitor_get_volumes(monitor);
- len = g_list_length (list);
+ len = g_list_length(list);
for ( i = 0; i < len; i++)
{
GVolume *volume;
GDrive *drive;
- volume = g_list_nth_data (list, i);
+ volume = g_list_nth_data(list, i);
- drive = g_volume_get_drive (volume);
+ drive = g_volume_get_drive(volume);
if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
{
gchar *unix_device;
- unix_device = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+ unix_device = g_volume_get_identifier(volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
if ( !g_strcmp0 (unix_device, device) )
{
GMount *mount;
- mount = g_volume_get_mount (volume);
+ mount = g_volume_get_mount(volume);
if ( mount )
{
- uri = parole_guess_uri_from_mount (mount);
- g_object_unref (mount);
- g_object_unref (drive);
- g_free (unix_device);
+ uri = parole_guess_uri_from_mount(mount);
+ g_object_unref(mount);
+ g_object_unref(drive);
+ g_free(unix_device);
break;
}
}
- g_free (unix_device);
+ g_free(unix_device);
}
- g_object_unref (drive);
+ g_object_unref(drive);
}
- g_list_foreach (list, (GFunc) g_object_unref, NULL);
- g_list_free (list);
+ g_list_foreach(list, (GFunc)g_object_unref, NULL);
+ g_list_free(list);
- g_object_unref (monitor);
+ g_object_unref(monitor);
- TRACE ("Got uri=%s for device=%s", uri, device);
+ TRACE("Got uri=%s for device=%s", uri, device);
return uri;
}
@@ -573,7 +573,7 @@ parole_get_uri_from_unix_device (const gchar *device)
*
* Returns : formated string for the media lenght
**/
-gchar *parole_format_media_length (gint total_seconds)
+gchar *parole_format_media_length(gint total_seconds)
{
gchar *timestring;
@@ -587,9 +587,9 @@ gchar *parole_format_media_length (gint total_seconds)
minutes = minutes % 60;
if ( hours == 0 ) {
- timestring = g_strdup_printf ("%02i:%02i", minutes, seconds);
+ timestring = g_strdup_printf("%02i:%02i", minutes, seconds);
} else {
- timestring = g_strdup_printf ("%i:%02i:%02i", hours, minutes, seconds);
+ timestring = g_strdup_printf("%i:%02i:%02i", hours, minutes, seconds);
}
return timestring;
@@ -604,7 +604,7 @@ gchar *parole_format_media_length (gint total_seconds)
* Returns: the length of the media only if the file is a local
* media file.
**/
-gchar *parole_taglibc_get_media_length (ParoleFile *file)
+gchar *parole_taglibc_get_media_length(ParoleFile *file)
{
#ifdef HAVE_TAGLIBC
@@ -612,17 +612,17 @@ gchar *parole_taglibc_get_media_length (ParoleFile *file)
if (g_str_has_prefix (parole_file_get_uri (file), "file:/"))
{
- tag_file = taglib_file_new (parole_file_get_file_name (file));
+ tag_file = taglib_file_new(parole_file_get_file_name(file));
if ( tag_file )
{
gint length = 0;
- const TagLib_AudioProperties *prop = taglib_file_audioproperties (tag_file);
+ const TagLib_AudioProperties *prop = taglib_file_audioproperties(tag_file);
if (prop)
- length = taglib_audioproperties_length (prop);
+ length = taglib_audioproperties_length(prop);
- taglib_file_free (tag_file);
+ taglib_file_free(tag_file);
if (length != 0)
return parole_format_media_length (length);
@@ -633,32 +633,32 @@ gchar *parole_taglibc_get_media_length (ParoleFile *file)
return NULL;
}
-GSimpleAction* g_simple_toggle_action_new (const gchar *action_name,
+GSimpleAction* g_simple_toggle_action_new(const gchar *action_name,
const GVariantType *parameter_type)
{
GSimpleAction *simple;
- simple = g_simple_action_new_stateful (action_name, parameter_type,
- g_variant_new_boolean (FALSE));
+ simple = g_simple_action_new_stateful(action_name, parameter_type,
+ g_variant_new_boolean(FALSE));
return simple;
}
-gboolean g_simple_toggle_action_get_active (GSimpleAction *simple)
+gboolean g_simple_toggle_action_get_active(GSimpleAction *simple)
{
GVariant *state;
- g_object_get (simple,
+ g_object_get(simple,
"state", &state,
NULL);
return g_variant_get_boolean(state);
}
-void g_simple_toggle_action_set_active (GSimpleAction *simple, gboolean active)
+void g_simple_toggle_action_set_active(GSimpleAction *simple, gboolean active)
{
if (g_simple_toggle_action_get_active(simple) != active)
{
- g_simple_action_set_state (simple, g_variant_new_boolean(active));
+ g_simple_action_set_state(simple, g_variant_new_boolean(active));
}
}
diff --git a/src/parole-vis.c b/src/parole-vis.c
index 8f57207..1fe9e30 100644
--- a/src/parole-vis.c
+++ b/src/parole-vis.c
@@ -34,14 +34,14 @@
#include "parole-vis.h"
static gboolean
-parole_vis_filter (GstPluginFeature *feature, gpointer data)
+parole_vis_filter(GstPluginFeature *feature, gpointer data)
{
GstElementFactory *factory;
if ( !GST_IS_ELEMENT_FACTORY (feature) )
return FALSE;
- factory = GST_ELEMENT_FACTORY (feature);
+ factory = GST_ELEMENT_FACTORY(feature);
if ( !g_strrstr (gst_element_factory_get_klass (factory), "Visualization"))
return FALSE;
@@ -50,30 +50,30 @@ parole_vis_filter (GstPluginFeature *feature, gpointer data)
}
static void
-parole_vis_get_name (GstElementFactory *factory, GHashTable **hash)
+parole_vis_get_name(GstElementFactory *factory, GHashTable **hash)
{
- g_hash_table_insert (*hash, g_strdup (gst_element_factory_get_longname (factory)), factory);
+ g_hash_table_insert(*hash, g_strdup(gst_element_factory_get_longname(factory)), factory);
}
-GHashTable *parole_vis_get_plugins (void)
+GHashTable *parole_vis_get_plugins(void)
{
GList *plugins = NULL;
GHashTable *hash;
- hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
#if GST_CHECK_VERSION(1, 0, 0)
- plugins = gst_registry_feature_filter (gst_registry_get (),
+ plugins = gst_registry_feature_filter(gst_registry_get(),
#else
- plugins = gst_registry_feature_filter (gst_registry_get_default (),
+ plugins = gst_registry_feature_filter(gst_registry_get_default(),
#endif
parole_vis_filter,
FALSE,
NULL);
- g_list_foreach (plugins, (GFunc) parole_vis_get_name, &hash);
+ g_list_foreach(plugins, (GFunc)parole_vis_get_name, &hash);
- gst_plugin_feature_list_free (plugins);
+ gst_plugin_feature_list_free(plugins);
return hash;
}
diff --git a/src/plugins/mpris2/mpris2-plugin.c b/src/plugins/mpris2/mpris2-plugin.c
index a55d60a..943592d 100644
--- a/src/plugins/mpris2/mpris2-plugin.c
+++ b/src/plugins/mpris2/mpris2-plugin.c
@@ -28,19 +28,19 @@
#include "mpris2-provider.h"
-G_MODULE_EXPORT GType parole_plugin_initialize (ParoleProviderPlugin *plugin);
+G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
-G_MODULE_EXPORT void parole_plugin_shutdown (void);
+G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize (ParoleProviderPlugin *plugin)
+parole_plugin_initialize(ParoleProviderPlugin *plugin)
{
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- mpris2_provider_register_type (plugin);
+ xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ mpris2_provider_register_type(plugin);
return MPRIS2_TYPE_PROVIDER;
}
G_MODULE_EXPORT void
-parole_plugin_shutdown (void)
+parole_plugin_shutdown(void)
{
}
diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index 1aac559..cde4462 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -28,8 +28,8 @@
#include <gst/tag/tag.h>
-static void mpris2_provider_iface_init (ParoleProviderPluginIface *iface);
-static void mpris2_provider_finalize (GObject *object);
+static void mpris2_provider_iface_init(ParoleProviderPluginIface *iface);
+static void mpris2_provider_finalize(GObject *object);
#define MPRIS_NAME "org.mpris.MediaPlayer2.parole"
#define MPRIS_PATH "/org/mpris/MediaPlayer2"
@@ -60,10 +60,10 @@ struct _Mpris2Provider
ParoleState state;
};
-PAROLE_DEFINE_TYPE_WITH_CODE (Mpris2Provider,
+PAROLE_DEFINE_TYPE_WITH_CODE(Mpris2Provider,
mpris2_provider,
G_TYPE_OBJECT,
- PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN,
+ PAROLE_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLUGIN,
mpris2_provider_iface_init));
static const gchar mpris2xml[] =
@@ -134,7 +134,7 @@ static const gchar mpris2xml[] =
/*
* org.mpris.MediaPlayer2
*/
-static void mpris_Root_Raise (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Root_Raise(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
GtkWidget *widget = parole_provider_player_get_main_window(provider->player);
if (widget)
@@ -145,32 +145,32 @@ static void mpris_Root_Raise (GDBusMethodInvocation *invocation, GVariant* param
gdk_window_raise(window);
}
}
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Root_Quit (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Root_Quit(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
/* TODO: optionally get a real close API since this won't work always */
gtk_main_quit();
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static GVariant* mpris_Root_get_CanQuit (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_CanQuit(GError **error, Mpris2Provider *provider)
{
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_CanRaise (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_CanRaise(GError **error, Mpris2Provider *provider)
{
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_Fullscreen (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_Fullscreen(GError **error, Mpris2Provider *provider)
{
return g_variant_new_boolean(provider->saved_fullscreen);
}
-static void mpris_Root_put_Fullscreen (GVariant *value, GError **error, Mpris2Provider *provider)
+static void mpris_Root_put_Fullscreen(GVariant *value, GError **error, Mpris2Provider *provider)
{
gboolean fullscreen = g_variant_get_boolean(value);
@@ -184,34 +184,34 @@ static void mpris_Root_put_Fullscreen (GVariant *value, GError **error, Mpris2Pr
}
}
-static GVariant* mpris_Root_get_CanSetFullscreen (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_CanSetFullscreen(GError **error, Mpris2Provider *provider)
{
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_HasTrackList (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_HasTrackList(GError **error, Mpris2Provider *provider)
{
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_Identity (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_Identity(GError **error, Mpris2Provider *provider)
{
return g_variant_new_string(_("Parole Media Player"));
}
-static GVariant* mpris_Root_get_DesktopEntry (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_DesktopEntry(GError **error, Mpris2Provider *provider)
{
return g_variant_new_string("parole");
}
-static GVariant* mpris_Root_get_SupportedUriSchemes (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_SupportedUriSchemes(GError **error, Mpris2Provider *provider)
{
return g_variant_parse(G_VARIANT_TYPE("as"),
"['cdda', 'dvd', 'file', 'icy', 'icyx', 'mms', 'mmsh', 'net', "
"'pnm', 'rtmp', 'rtp', 'rtsp', 'uvox']", NULL, NULL, NULL);
}
-static GVariant* mpris_Root_get_SupportedMimeTypes (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Root_get_SupportedMimeTypes(GError **error, Mpris2Provider *provider)
{
return g_variant_parse(G_VARIANT_TYPE("as"),
"['application/mxf', 'application/ogg', 'application/ram', "
@@ -252,20 +252,20 @@ static GVariant* mpris_Root_get_SupportedMimeTypes (GError **error, Mpris2Provid
/*
* org.mpris.MediaPlayer2.Player
*/
-static void mpris_Player_Play (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_Play(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
- ParoleState state = parole_provider_player_get_state (player);
+ ParoleState state = parole_provider_player_get_state(player);
switch (state)
{
case PAROLE_STATE_PAUSED:
- parole_provider_player_resume (provider->player);
+ parole_provider_player_resume(provider->player);
break;
case PAROLE_STATE_STOPPED:
case PAROLE_STATE_PLAYBACK_FINISHED:
- parole_provider_player_play_next (provider->player);
+ parole_provider_player_play_next(provider->player);
break;
case PAROLE_STATE_ABOUT_TO_FINISH:
@@ -274,44 +274,44 @@ static void mpris_Player_Play (GDBusMethodInvocation *invocation, GVariant* para
break;
}
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Next (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_Next(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
- parole_provider_player_play_next (provider->player);
+ parole_provider_player_play_next(provider->player);
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Previous (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_Previous(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
- parole_provider_player_play_previous (provider->player);
+ parole_provider_player_play_previous(provider->player);
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Pause (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_Pause(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
- parole_provider_player_pause (provider->player);
+ parole_provider_player_pause(provider->player);
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_PlayPause (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_PlayPause(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
- ParoleState state = parole_provider_player_get_state (player);
+ ParoleState state = parole_provider_player_get_state(player);
switch (state)
{
case PAROLE_STATE_PAUSED:
- parole_provider_player_resume (player);
+ parole_provider_player_resume(player);
break;
case PAROLE_STATE_STOPPED:
case PAROLE_STATE_PLAYBACK_FINISHED:
- parole_provider_player_play_next (player);
+ parole_provider_player_play_next(player);
break;
case PAROLE_STATE_ABOUT_TO_FINISH:
@@ -320,17 +320,17 @@ static void mpris_Player_PlayPause (GDBusMethodInvocation *invocation, GVariant*
break;
}
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Stop (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_Stop(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
- parole_provider_player_stop (provider->player);
+ parole_provider_player_stop(provider->player);
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_Seek(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
const ParoleStream *stream = parole_provider_player_get_stream(player);
@@ -339,27 +339,27 @@ static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant* para
gint64 seek;
gint64 duration;
- if (parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
- g_dbus_method_invocation_return_error_literal (invocation,
+ if (parole_provider_player_get_state(player) == PAROLE_STATE_STOPPED) {
+ g_dbus_method_invocation_return_error_literal(invocation,
G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
return;
}
g_variant_get(parameters, "(x)", ¶m);
- curr_pos = parole_provider_player_get_stream_position (player);
+ curr_pos = parole_provider_player_get_stream_position(player);
seek = (curr_pos + param) / GST_MSECOND;
- g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
+ g_object_get(G_OBJECT(stream), "duration", &duration, NULL);
- seek = CLAMP (seek, 0, duration);
+ seek = CLAMP(seek, 0, duration);
- parole_provider_player_seek (player, seek);
+ parole_provider_player_seek(player, seek);
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_SetPosition(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
const ParoleStream *stream = parole_provider_player_get_stream(player);
@@ -368,8 +368,8 @@ static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation, GVarian
gint64 seek;
gint64 duration;
- if (parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
- g_dbus_method_invocation_return_error_literal (invocation,
+ if (parole_provider_player_get_state(player) == PAROLE_STATE_STOPPED) {
+ g_dbus_method_invocation_return_error_literal(invocation,
G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
return;
}
@@ -380,16 +380,16 @@ static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation, GVarian
seek = param / GST_MSECOND;
- g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
+ g_object_get(G_OBJECT(stream), "duration", &duration, NULL);
- seek = CLAMP (seek, 0, duration);
+ seek = CLAMP(seek, 0, duration);
- parole_provider_player_seek (player, seek);
+ parole_provider_player_seek(player, seek);
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_OpenUri (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
+static void mpris_Player_OpenUri(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
gchar *uri = NULL;
gboolean happened = FALSE;
@@ -397,20 +397,20 @@ static void mpris_Player_OpenUri (GDBusMethodInvocation *invocation, GVariant* p
g_variant_get(parameters, "(s)", &uri);
if (uri) {
- happened = parole_provider_player_play_uri (player, uri);
+ happened = parole_provider_player_play_uri(player, uri);
g_free(uri);
}
if (happened)
- g_dbus_method_invocation_return_value (invocation, NULL);
+ g_dbus_method_invocation_return_value(invocation, NULL);
else
- g_dbus_method_invocation_return_error_literal (invocation,
+ g_dbus_method_invocation_return_error_literal(invocation,
G_DBUS_ERROR,
G_DBUS_ERROR_INVALID_FILE_CONTENT,
"This file does not play here.");
}
-static GVariant* mpris_Player_get_PlaybackStatus (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_PlaybackStatus(GError **error, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
@@ -426,47 +426,47 @@ static GVariant* mpris_Player_get_PlaybackStatus (GError **error, Mpris2Provider
}
}
-static GVariant* mpris_Player_get_LoopStatus (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_LoopStatus(GError **error, Mpris2Provider *provider)
{
gboolean repeat = FALSE;
- g_object_get (G_OBJECT (provider->conf), "repeat", &repeat, NULL);
+ g_object_get(G_OBJECT(provider->conf), "repeat", &repeat, NULL);
return g_variant_new_string(repeat ? "Playlist" : "None");
}
-static void mpris_Player_put_LoopStatus (GVariant *value, GError **error, Mpris2Provider *provider)
+static void mpris_Player_put_LoopStatus(GVariant *value, GError **error, Mpris2Provider *provider)
{
const gchar *new_loop = g_variant_get_string(value, NULL);
gboolean repeat = g_strcmp0("Playlist", new_loop) ? FALSE : TRUE;
- g_object_set (G_OBJECT (provider->conf), "repeat", repeat, NULL);
+ g_object_set(G_OBJECT(provider->conf), "repeat", repeat, NULL);
}
-static GVariant* mpris_Player_get_Rate (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_Rate(GError **error, Mpris2Provider *provider)
{
return g_variant_new_double(1.0);
}
-static void mpris_Player_put_Rate (GVariant *value, GError **error, Mpris2Provider *provider)
+static void mpris_Player_put_Rate(GVariant *value, GError **error, Mpris2Provider *provider)
{
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "This is not alsaplayer.");
+ g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "This is not alsaplayer.");
}
-static GVariant* mpris_Player_get_Shuffle (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_Shuffle(GError **error, Mpris2Provider *provider)
{
gboolean shuffle = FALSE;
- g_object_get (G_OBJECT (provider->conf), "shuffle", &shuffle, NULL);
+ g_object_get(G_OBJECT(provider->conf), "shuffle", &shuffle, NULL);
return g_variant_new_boolean(shuffle);
}
-static void mpris_Player_put_Shuffle (GVariant *value, GError **error, Mpris2Provider *provider)
+static void mpris_Player_put_Shuffle(GVariant *value, GError **error, Mpris2Provider *provider)
{
gboolean shuffle = g_variant_get_boolean(value);
- g_object_set (G_OBJECT (provider->conf), "shuffle", shuffle, NULL);
+ g_object_set(G_OBJECT(provider->conf), "shuffle", shuffle, NULL);
}
static GVariant * handle_get_trackid(const ParoleStream *stream)
@@ -481,7 +481,7 @@ static GVariant * handle_get_trackid(const ParoleStream *stream)
return g_variant_new_object_path(o);
}
-static void g_variant_builder_add_array (GVariantBuilder *b, const gchar *tag, const gchar *val)
+static void g_variant_builder_add_array(GVariantBuilder *b, const gchar *tag, const gchar *val)
{
GVariant *vval = NULL, *vvals = NULL;
@@ -491,26 +491,26 @@ static void g_variant_builder_add_array (GVariantBuilder *b, const gchar *tag, c
vval = g_variant_new_string(val);
vvals = g_variant_new_array(G_VARIANT_TYPE_STRING, &vval, 1);
- g_variant_builder_add (b, "{sv}", tag, vvals);
+ g_variant_builder_add(b, "{sv}", tag, vvals);
}
-static void g_variant_builder_add_string (GVariantBuilder *b, const gchar *tag, const gchar *val)
+static void g_variant_builder_add_string(GVariantBuilder *b, const gchar *tag, const gchar *val)
{
if (!val)
return;
- g_variant_builder_add (b, "{sv}", tag,
+ g_variant_builder_add(b, "{sv}", tag,
g_variant_new_string(val));
}
-static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder *b)
+static void handle_get_metadata(const ParoleStream *stream, GVariantBuilder *b)
{
gchar *title, *album, *artist, *year, *comment, *stream_uri, *genre, *image_uri;
gint track_id, bitrate;
gint64 duration;
gboolean has_video;
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"title", &title,
"album", &album,
"artist", &artist,
@@ -531,25 +531,25 @@ static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder *b)
image_uri = NULL;
}
- g_variant_builder_add (b, "{sv}", "mpris:trackid",
+ g_variant_builder_add(b, "{sv}", "mpris:trackid",
handle_get_trackid(stream));
- g_variant_builder_add_string (b, "mpris:artUrl", image_uri);
- g_variant_builder_add_string (b, "xesam:url", stream_uri);
- g_variant_builder_add_string (b, "xesam:title", title);
- g_variant_builder_add_array (b, "xesam:artist", artist);
- g_variant_builder_add_string (b, "xesam:album", album);
- g_variant_builder_add_array (b, "xesam:genre", genre);
- g_variant_builder_add_string (b, "xesam:contentCreated", year);
- g_variant_builder_add (b, "{sv}", "xesam:trackNumber",
+ g_variant_builder_add_string(b, "mpris:artUrl", image_uri);
+ g_variant_builder_add_string(b, "xesam:url", stream_uri);
+ g_variant_builder_add_string(b, "xesam:title", title);
+ g_variant_builder_add_array(b, "xesam:artist", artist);
+ g_variant_builder_add_string(b, "xesam:album", album);
+ g_variant_builder_add_array(b, "xesam:genre", genre);
+ g_variant_builder_add_string(b, "xesam:contentCreated", year);
+ g_variant_builder_add(b, "{sv}", "xesam:trackNumber",
g_variant_new_int32(track_id));
- g_variant_builder_add_array (b, "xesam:comment", comment);
- g_variant_builder_add (b, "{sv}", "mpris:length",
+ g_variant_builder_add_array(b, "xesam:comment", comment);
+ g_variant_builder_add(b, "{sv}", "mpris:length",
g_variant_new_int64((gint64)duration * 1000000));
- g_variant_builder_add (b, "{sv}", "audio-bitrate",
+ g_variant_builder_add(b, "{sv}", "audio-bitrate",
g_variant_new_int32(bitrate));
- g_variant_builder_add (b, "{sv}", "audio-channels", // No GST_TAG
+ g_variant_builder_add(b, "{sv}", "audio-channels", // No GST_TAG
g_variant_new_int32(0));
- g_variant_builder_add (b, "{sv}", "audio-samplerate", // No GST_TAG
+ g_variant_builder_add(b, "{sv}", "audio-samplerate", // No GST_TAG
g_variant_new_int32(0));
g_free(title);
@@ -561,42 +561,42 @@ static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder *b)
g_free(image_uri);
}
-static GVariant* mpris_Player_get_Metadata (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_Metadata(GError **error, Mpris2Provider *provider)
{
GVariantBuilder b;
const ParoleStream *stream;
ParoleProviderPlayer *player = provider->player;
- g_variant_builder_init(&b, G_VARIANT_TYPE ("a{sv}"));
+ g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
if (parole_provider_player_get_state(player) != PAROLE_STATE_STOPPED) {
stream = parole_provider_player_get_stream(player);
- handle_get_metadata (stream, &b);
+ handle_get_metadata(stream, &b);
} else {
- g_variant_builder_add (&b, "{sv}", "mpris:trackid",
+ g_variant_builder_add(&b, "{sv}", "mpris:trackid",
handle_get_trackid(NULL));
}
return g_variant_builder_end(&b);
}
-static gdouble handle_get_volume (Mpris2Provider *provider)
+static gdouble handle_get_volume(Mpris2Provider *provider)
{
gint volume_int = 0;
gdouble volume_double;
- g_object_get (G_OBJECT (provider->conf), "volume", &volume_int, NULL);
+ g_object_get(G_OBJECT(provider->conf), "volume", &volume_int, NULL);
volume_double = (double)volume_int / 100.0;
return volume_double;
}
-static GVariant* mpris_Player_get_Volume (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_Volume(GError **error, Mpris2Provider *provider)
{
return g_variant_new_double(handle_get_volume(provider));
}
-static void mpris_Player_put_Volume (GVariant *value, GError **error, Mpris2Provider *provider)
+static void mpris_Player_put_Volume(GVariant *value, GError **error, Mpris2Provider *provider)
{
gdouble volume = g_variant_get_double(value);
@@ -608,55 +608,55 @@ static void mpris_Player_put_Volume (GVariant *value, GError **error, Mpris2Prov
g_object_set(G_OBJECT(provider->conf), "volume", (gint) (volume * 100.0), NULL);
}
-static GVariant* mpris_Player_get_Position (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_Position(GError **error, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
gint64 position = 0;
- position = (gint64) parole_provider_player_get_stream_position (player);
+ position =(gint64) parole_provider_player_get_stream_position(player);
return g_variant_new_int64(position);
}
-static GVariant* mpris_Player_get_MinimumRate (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_MinimumRate(GError **error, Mpris2Provider *provider)
{
return g_variant_new_double(1.0);
}
-static GVariant* mpris_Player_get_MaximumRate (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_MaximumRate(GError **error, Mpris2Provider *provider)
{
return g_variant_new_double(1.0);
}
-static GVariant* mpris_Player_get_CanGoNext (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_CanGoNext(GError **error, Mpris2Provider *provider)
{
// do we need to go into such detail?
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Player_get_CanGoPrevious (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_CanGoPrevious(GError **error, Mpris2Provider *provider)
{
// do we need to go into such detail?
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Player_get_CanPlay (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_CanPlay(GError **error, Mpris2Provider *provider)
{
/* The CanPlay property should be true when the player is playing or paused. */
ParoleProviderPlayer *player = provider->player;
- gint state = parole_provider_player_get_state (player);
+ gint state = parole_provider_player_get_state(player);
return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state == PAROLE_STATE_PLAYING);
}
-static GVariant* mpris_Player_get_CanPause (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_CanPause(GError **error, Mpris2Provider *provider)
{
/* The CanPause property should be true when the player is playing or paused. */
ParoleProviderPlayer *player = provider->player;
- gint state = parole_provider_player_get_state (player);
+ gint state = parole_provider_player_get_state(player);
return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state == PAROLE_STATE_PLAYING);
}
-static GVariant* mpris_Player_get_CanSeek (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_CanSeek(GError **error, Mpris2Provider *provider)
{
gboolean seekable = FALSE;
ParoleProviderPlayer *player = provider->player;
@@ -664,14 +664,14 @@ static GVariant* mpris_Player_get_CanSeek (GError **error, Mpris2Provider *provi
const ParoleStream *stream;
stream = parole_provider_player_get_stream(player);
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"seekable", &seekable,
NULL);
return g_variant_new_boolean (seekable);
}
-static GVariant* mpris_Player_get_CanControl (GError **error, Mpris2Provider *provider)
+static GVariant* mpris_Player_get_CanControl(GError **error, Mpris2Provider *provider)
{
return g_variant_new_boolean(TRUE);
}
@@ -680,7 +680,7 @@ static GVariant* mpris_Player_get_CanControl (GError **error, Mpris2Provider *pr
* Update state.
*/
-static void parole_mpris_update_any (Mpris2Provider *provider)
+static void parole_mpris_update_any(Mpris2Provider *provider)
{
const ParoleStream *stream;
gboolean change_detected = FALSE, shuffle = FALSE, repeat = FALSE;
@@ -693,42 +693,42 @@ static void parole_mpris_update_any (Mpris2Provider *provider)
if (NULL == provider->dbus_connection)
return; /* better safe than sorry */
- g_debug ("MPRIS: update any");
+ g_debug("MPRIS: update any");
stream = parole_provider_player_get_stream(player);
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"uri", &stream_uri,
NULL);
g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
- g_object_get (G_OBJECT (provider->conf), "shuffle", &shuffle, NULL);
+ g_object_get(G_OBJECT(provider->conf), "shuffle", &shuffle, NULL);
if (provider->saved_shuffle != shuffle) {
change_detected = TRUE;
provider->saved_shuffle = shuffle;
- g_variant_builder_add (&b, "{sv}", "Shuffle", mpris_Player_get_Shuffle (NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "Shuffle", mpris_Player_get_Shuffle(NULL, provider));
}
- if (provider->state != parole_provider_player_get_state (player)) {
+ if (provider->state != parole_provider_player_get_state(player)) {
change_detected = TRUE;
- provider->state = parole_provider_player_get_state (player);
- g_variant_builder_add (&b, "{sv}", "PlaybackStatus", mpris_Player_get_PlaybackStatus (NULL, provider));
- g_variant_builder_add (&b, "{sv}", "CanPlay", mpris_Player_get_CanPlay(NULL, provider));
- g_variant_builder_add (&b, "{sv}", "CanPause", mpris_Player_get_CanPause(NULL, provider));
- g_variant_builder_add (&b, "{sv}", "CanSeek", mpris_Player_get_CanSeek(NULL, provider));
+ provider->state = parole_provider_player_get_state(player);
+ g_variant_builder_add(&b, "{sv}", "PlaybackStatus", mpris_Player_get_PlaybackStatus(NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "CanPlay", mpris_Player_get_CanPlay(NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "CanPause", mpris_Player_get_CanPause(NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "CanSeek", mpris_Player_get_CanSeek(NULL, provider));
}
- g_object_get (G_OBJECT (provider->conf), "repeat", &repeat, NULL);
+ g_object_get(G_OBJECT(provider->conf), "repeat", &repeat, NULL);
if (provider->saved_playbackstatus != repeat) {
change_detected = TRUE;
provider->saved_playbackstatus = repeat;
- g_variant_builder_add (&b, "{sv}", "LoopStatus", mpris_Player_get_LoopStatus (NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "LoopStatus", mpris_Player_get_LoopStatus(NULL, provider));
}
curr_vol = handle_get_volume(provider);
if (provider->volume != curr_vol) {
change_detected = TRUE;
provider->volume = curr_vol;
- g_variant_builder_add (&b, "{sv}", "Volume", mpris_Player_get_Volume (NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "Volume", mpris_Player_get_Volume(NULL, provider));
}
- if (parole_provider_player_get_state (player) == PAROLE_STATE_PLAYING) {
+ if (parole_provider_player_get_state(player) == PAROLE_STATE_PLAYING) {
if (g_strcmp0(provider->saved_title, stream_uri)) {
change_detected = TRUE;
if (provider->saved_title)
@@ -738,13 +738,13 @@ static void parole_mpris_update_any (Mpris2Provider *provider)
else
provider->saved_title = NULL;
- g_variant_builder_add (&b, "{sv}", "Metadata", mpris_Player_get_Metadata (NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "Metadata", mpris_Player_get_Metadata(NULL, provider));
}
}
if (provider->saved_fullscreen != parole_provider_player_get_fullscreen(player)) {
change_detected = TRUE;
provider->saved_fullscreen = !provider->saved_fullscreen;
- g_variant_builder_add (&b, "{sv}", "Fullscreen", mpris_Root_get_Fullscreen (NULL, provider));
+ g_variant_builder_add(&b, "{sv}", "Fullscreen", mpris_Root_get_Fullscreen(NULL, provider));
}
if (change_detected) {
GVariant * tuples[] = {
@@ -763,30 +763,30 @@ static void parole_mpris_update_any (Mpris2Provider *provider)
static void
-state_changed_cb (ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, Mpris2Provider *provider)
+state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, Mpris2Provider *provider)
{
- parole_mpris_update_any (provider);
+ parole_mpris_update_any(provider);
}
static void
-seeked_cb (ParoleProviderPlayer *player, Mpris2Provider *provider)
+seeked_cb(ParoleProviderPlayer *player, Mpris2Provider *provider)
{
gint64 position = 0;
if (NULL == provider->dbus_connection)
return; /* better safe than sorry */
- position = (gint64) parole_provider_player_get_stream_position (provider->player);
+ position =(gint64) parole_provider_player_get_stream_position(provider->player);
g_dbus_connection_emit_signal(provider->dbus_connection, NULL, MPRIS_PATH,
"org.mpris.MediaPlayer2.Player", "Seeked",
- g_variant_new ("(x)", position), NULL);
+ g_variant_new("(x)", position), NULL);
}
static void
-conf_changed_cb (ParoleConf *conf, GParamSpec *pspec, Mpris2Provider *provider)
+conf_changed_cb(ParoleConf *conf, GParamSpec *pspec, Mpris2Provider *provider)
{
- parole_mpris_update_any (provider);
+ parole_mpris_update_any(provider);
}
@@ -794,7 +794,7 @@ conf_changed_cb (ParoleConf *conf, GParamSpec *pspec, Mpris2Provider *provider)
* Dbus callbacks
*/
static void
-handle_method_call (GDBusConnection *connection,
+handle_method_call(GDBusConnection *connection,
const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
@@ -805,7 +805,7 @@ handle_method_call (GDBusConnection *connection,
{
Mpris2Provider *provider;
ParoleProviderPlugin *plugin = user_data;
- provider = MPRIS2_PROVIDER (plugin);
+ provider = MPRIS2_PROVIDER(plugin);
/* org.mpris.MediaPlayer2 */
BEGIN_INTERFACE(0)
@@ -827,7 +827,7 @@ handle_method_call (GDBusConnection *connection,
}
static GVariant *
-handle_get_property (GDBusConnection *connection,
+handle_get_property(GDBusConnection *connection,
const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
@@ -837,7 +837,7 @@ handle_get_property (GDBusConnection *connection,
{
Mpris2Provider *provider;
ParoleProviderPlugin *plugin = user_data;
- provider = MPRIS2_PROVIDER (plugin);
+ provider = MPRIS2_PROVIDER(plugin);
/* org.mpris.MediaPlayer2 */
BEGIN_INTERFACE(0)
@@ -874,7 +874,7 @@ handle_get_property (GDBusConnection *connection,
}
static gboolean
-handle_set_property (GDBusConnection *connection,
+handle_set_property(GDBusConnection *connection,
const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
@@ -884,7 +884,7 @@ handle_set_property (GDBusConnection *connection,
void *user_data)
{
ParoleProviderPlugin *plugin = user_data;
- Mpris2Provider *provider = MPRIS2_PROVIDER (plugin);
+ Mpris2Provider *provider = MPRIS2_PROVIDER(plugin);
/* org.mpris.MediaPlayer2 */
BEGIN_INTERFACE(0)
@@ -910,7 +910,7 @@ GDBusInterfaceVTable interface_vtable =
};
static void
-on_bus_acquired (GDBusConnection *connection,
+on_bus_acquired(GDBusConnection *connection,
const gchar *name,
gpointer user_data)
{
@@ -919,28 +919,28 @@ on_bus_acquired (GDBusConnection *connection,
ParoleProviderPlugin *plugin = user_data;
- provider = MPRIS2_PROVIDER (plugin);
+ provider = MPRIS2_PROVIDER(plugin);
provider->interface_quarks[0] = g_quark_from_string(provider->introspection_data->interfaces[0]->name);
- registration_id = g_dbus_connection_register_object (connection,
+ registration_id = g_dbus_connection_register_object(connection,
MPRIS_PATH,
provider->introspection_data->interfaces[0],
&interface_vtable,
plugin, /* user_data */
NULL, /* user_data_free_func */
NULL); /* GError** */
- g_assert (registration_id > 0);
+ g_assert(registration_id > 0);
provider->registration_id0 = registration_id;
provider->interface_quarks[1] = g_quark_from_string(provider->introspection_data->interfaces[1]->name);
- registration_id = g_dbus_connection_register_object (connection,
+ registration_id = g_dbus_connection_register_object(connection,
MPRIS_PATH,
provider->introspection_data->interfaces[1],
&interface_vtable,
plugin, /* user_data */
NULL, /* user_data_free_func */
NULL); /* GError** */
- g_assert (registration_id > 0);
+ g_assert(registration_id > 0);
provider->registration_id1 = registration_id;
provider->dbus_connection = connection;
@@ -948,7 +948,7 @@ on_bus_acquired (GDBusConnection *connection,
}
static void
-on_name_acquired (GDBusConnection *connection,
+on_name_acquired(GDBusConnection *connection,
const gchar *name,
gpointer user_data)
{
@@ -956,29 +956,29 @@ on_name_acquired (GDBusConnection *connection,
}
static void
-on_name_lost (GDBusConnection *connection,
+on_name_lost(GDBusConnection *connection,
const gchar *name,
gpointer user_data)
{
Mpris2Provider *provider;
ParoleProviderPlugin *plugin = user_data;
- provider = MPRIS2_PROVIDER (plugin);
+ provider = MPRIS2_PROVIDER(plugin);
if (NULL != provider->dbus_connection) {
g_object_unref(G_OBJECT(provider->dbus_connection));
provider->dbus_connection = NULL;
}
- g_warning ("Lost DBus name %s", name);
+ g_warning("Lost DBus name %s", name);
}
static gboolean
-on_window_state_event (GtkWidget *widget,
+on_window_state_event(GtkWidget *widget,
GdkEventWindowState *event,
Mpris2Provider *provider)
{
- parole_mpris_update_any (provider);
+ parole_mpris_update_any(provider);
return FALSE;
}
@@ -986,25 +986,25 @@ on_window_state_event (GtkWidget *widget,
* Plugin interface.
*/
-static gboolean mpris2_provider_is_configurable (ParoleProviderPlugin *plugin)
+static gboolean mpris2_provider_is_configurable(ParoleProviderPlugin *plugin)
{
return FALSE;
}
static void
-mpris2_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
+mpris2_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
{
Mpris2Provider *provider;
GtkWidget *window;
- provider = MPRIS2_PROVIDER (plugin);
+ provider = MPRIS2_PROVIDER(plugin);
provider->player = player;
provider->saved_fullscreen = FALSE;
- provider->introspection_data = g_dbus_node_info_new_for_xml (mpris2xml, NULL);
- g_assert (provider->introspection_data != NULL);
+ provider->introspection_data = g_dbus_node_info_new_for_xml(mpris2xml, NULL);
+ g_assert(provider->introspection_data != NULL);
- provider->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+ provider->owner_id = g_bus_own_name(G_BUS_TYPE_SESSION,
MPRIS_NAME,
G_BUS_NAME_OWNER_FLAGS_NONE,
on_bus_acquired,
@@ -1013,22 +1013,22 @@ mpris2_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *
plugin,
NULL);
- g_signal_connect (player, "state_changed",
- G_CALLBACK (state_changed_cb), plugin);
+ g_signal_connect(player, "state_changed",
+ G_CALLBACK(state_changed_cb), plugin);
- g_signal_connect (player, "seeked",
- G_CALLBACK (seeked_cb), plugin);
+ g_signal_connect(player, "seeked",
+ G_CALLBACK(seeked_cb), plugin);
provider->conf = parole_conf_new();
- g_signal_connect (provider->conf, "notify::repeat",
- G_CALLBACK (conf_changed_cb), plugin);
+ g_signal_connect(provider->conf, "notify::repeat",
+ G_CALLBACK(conf_changed_cb), plugin);
- g_signal_connect (provider->conf, "notify::shuffle",
- G_CALLBACK (conf_changed_cb), plugin);
+ g_signal_connect(provider->conf, "notify::shuffle",
+ G_CALLBACK(conf_changed_cb), plugin);
- g_signal_connect (provider->conf, "notify::volume",
- G_CALLBACK (conf_changed_cb), plugin);
+ g_signal_connect(provider->conf, "notify::volume",
+ G_CALLBACK(conf_changed_cb), plugin);
window = parole_provider_player_get_main_window(provider->player);
g_signal_connect(G_OBJECT(window),
@@ -1038,53 +1038,53 @@ mpris2_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *
}
static void
-mpris2_provider_iface_init (ParoleProviderPluginIface *iface)
+mpris2_provider_iface_init(ParoleProviderPluginIface *iface)
{
iface->get_is_configurable = mpris2_provider_is_configurable;
iface->set_player = mpris2_provider_set_player;
}
-static void mpris2_provider_class_init (Mpris2ProviderClass *klass)
+static void mpris2_provider_class_init(Mpris2ProviderClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = mpris2_provider_finalize;
}
-static void mpris2_provider_init (Mpris2Provider *provider)
+static void mpris2_provider_init(Mpris2Provider *provider)
{
provider->player = NULL;
provider->conf = NULL;
}
-static void mpris2_provider_finalize (GObject *object)
+static void mpris2_provider_finalize(GObject *object)
{
Mpris2Provider *provider;
- provider = MPRIS2_PROVIDER (object);
+ provider = MPRIS2_PROVIDER(object);
if (NULL != provider->dbus_connection) {
- g_dbus_connection_unregister_object (provider->dbus_connection,
+ g_dbus_connection_unregister_object(provider->dbus_connection,
provider->registration_id0);
- g_dbus_connection_unregister_object (provider->dbus_connection,
+ g_dbus_connection_unregister_object(provider->dbus_connection,
provider->registration_id1);
}
if (NULL != provider->dbus_connection)
- g_bus_unown_name (provider->owner_id);
+ g_bus_unown_name(provider->owner_id);
if (NULL != provider->introspection_data) {
- g_dbus_node_info_unref (provider->introspection_data);
+ g_dbus_node_info_unref(provider->introspection_data);
provider->introspection_data = NULL;
}
if (NULL != provider->dbus_connection) {
- g_object_unref (G_OBJECT (provider->dbus_connection));
+ g_object_unref(G_OBJECT(provider->dbus_connection));
provider->dbus_connection = NULL;
}
- g_object_unref (provider->conf);
+ g_object_unref(provider->conf);
- g_free (provider->saved_title);
+ g_free(provider->saved_title);
- G_OBJECT_CLASS (mpris2_provider_parent_class)->finalize (object);
+ G_OBJECT_CLASS(mpris2_provider_parent_class)->finalize(object);
}
diff --git a/src/plugins/notify/notify-plugin.c b/src/plugins/notify/notify-plugin.c
index 975e080..605814a 100644
--- a/src/plugins/notify/notify-plugin.c
+++ b/src/plugins/notify/notify-plugin.c
@@ -28,21 +28,21 @@
#include "notify-provider.h"
-G_MODULE_EXPORT GType parole_plugin_initialize (ParoleProviderPlugin *plugin);
+G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
-G_MODULE_EXPORT void parole_plugin_shutdown (void);
+G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize (ParoleProviderPlugin *plugin)
+parole_plugin_initialize(ParoleProviderPlugin *plugin)
{
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- notify_provider_register_type (plugin);
+ notify_provider_register_type(plugin);
return NOTIFY_TYPE_PROVIDER;
}
G_MODULE_EXPORT void
-parole_plugin_shutdown (void)
+parole_plugin_shutdown(void)
{
}
diff --git a/src/plugins/notify/notify-provider.c b/src/plugins/notify/notify-provider.c
index e6ac8e0..9946bd3 100644
--- a/src/plugins/notify/notify-provider.c
+++ b/src/plugins/notify/notify-provider.c
@@ -33,8 +33,8 @@
#include "notify-provider.h"
-static void notify_provider_iface_init (ParoleProviderPluginIface *iface);
-static void notify_provider_finalize (GObject *object);
+static void notify_provider_iface_init(ParoleProviderPluginIface *iface);
+static void notify_provider_finalize(GObject *object);
struct _NotifyProviderClass
@@ -51,32 +51,32 @@ struct _NotifyProvider
NotifyNotification *notification;
};
-PAROLE_DEFINE_TYPE_WITH_CODE (NotifyProvider,
+PAROLE_DEFINE_TYPE_WITH_CODE(NotifyProvider,
notify_provider,
G_TYPE_OBJECT,
- PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN,
+ PAROLE_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLUGIN,
notify_provider_iface_init));
static void
-notification_closed_cb (NotifyNotification *n, NotifyProvider *notify)
+notification_closed_cb(NotifyNotification *n, NotifyProvider *notify)
{
- g_object_unref (notify->notification);
+ g_object_unref(notify->notification);
notify->notification = NULL;
}
static void
-close_notification (NotifyProvider *notify)
+close_notification(NotifyProvider *notify)
{
if ( notify->notification )
{
GError *error = NULL;
- notify_notification_close (notify->notification, &error);
+ notify_notification_close(notify->notification, &error);
if ( error )
{
- g_warning ("Failed to close notification : %s", error->message);
- g_error_free (error);
+ g_warning("Failed to close notification : %s", error->message);
+ g_error_free(error);
}
- g_object_unref (notify->notification);
+ g_object_unref(notify->notification);
notify->notification = NULL;
}
}
@@ -84,17 +84,17 @@ close_notification (NotifyProvider *notify)
static void
on_previous_clicked(NotifyNotification *notification, char *action, NotifyProvider *notify)
{
- parole_provider_player_play_previous (notify->player);
+ parole_provider_player_play_previous(notify->player);
}
static void
on_next_clicked(NotifyNotification *notification, char *action, NotifyProvider *notify)
{
- parole_provider_player_play_next (notify->player);
+ parole_provider_player_play_next(notify->player);
}
static void
-notify_playing (NotifyProvider *notify, const ParoleStream *stream)
+notify_playing(NotifyProvider *notify, const ParoleStream *stream)
{
GdkPixbuf *pix;
gboolean has_video, enabled;
@@ -103,7 +103,7 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
ParoleMediaType media_type;
GSimpleAction *action;
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"title", &title,
"album", &album,
"artist", &artist,
@@ -126,16 +126,16 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
{
gchar *uri;
gchar *filename;
- g_object_get (G_OBJECT (stream),
+ g_object_get(G_OBJECT(stream),
"uri", &uri,
NULL);
- filename = g_filename_from_uri (uri, NULL, NULL);
- g_free (uri);
+ filename = g_filename_from_uri(uri, NULL, NULL);
+ g_free(uri);
if ( filename )
{
- title = g_path_get_basename (filename);
- g_free (filename);
+ title = g_path_get_basename(filename);
+ g_free(filename);
if ( !title )
return;
}
@@ -147,10 +147,10 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
artist = g_strdup(_("Unknown Artist"));
if (!year)
- message = g_strdup_printf ("%s %s\n%s %s", _("<i>on</i>"), album, _("<i>by</i>"), artist);
+ message = g_strdup_printf("%s %s\n%s %s", _("<i>on</i>"), album, _("<i>by</i>"), artist);
else
{
- message = g_strdup_printf ("%s %s (%s)\n%s %s", _("<i>on</i>"), album, year, _("<i>by</i>"), artist);
+ message = g_strdup_printf("%s %s(%s)\n%s %s", _("<i>on</i>"), album, year, _("<i>by</i>"), artist);
g_free(year);
}
@@ -159,18 +159,18 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
#ifdef NOTIFY_CHECK_VERSION
#if NOTIFY_CHECK_VERSION (0, 7, 0)
- notify->notification = notify_notification_new (title, message, NULL);
+ notify->notification = notify_notification_new(title, message, NULL);
#else
- notify->notification = notify_notification_new (title, message, NULL, NULL);
+ notify->notification = notify_notification_new(title, message, NULL, NULL);
#endif
#else
- notify->notification = notify_notification_new (title, message, NULL, NULL);
+ notify->notification = notify_notification_new(title, message, NULL, NULL);
#endif
- g_free (title);
- g_free (message);
+ g_free(title);
+ g_free(message);
if (media_type == PAROLE_MEDIA_TYPE_CDDA)
- pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
"media-cdrom-audio",
48,
GTK_ICON_LOOKUP_USE_BUILTIN,
@@ -179,7 +179,7 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
pix = parole_stream_get_image(G_OBJECT(stream));
if (!pix)
- pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
"audio-x-generic",
48,
GTK_ICON_LOOKUP_USE_BUILTIN,
@@ -187,20 +187,20 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
if ( pix )
{
- notify_notification_set_icon_from_pixbuf (notify->notification, pix);
- g_object_unref (pix);
+ notify_notification_set_icon_from_pixbuf(notify->notification, pix);
+ g_object_unref(pix);
}
- notify_notification_set_urgency (notify->notification, NOTIFY_URGENCY_LOW);
- notify_notification_set_timeout (notify->notification, 5000);
+ notify_notification_set_urgency(notify->notification, NOTIFY_URGENCY_LOW);
+ notify_notification_set_timeout(notify->notification, 5000);
/* Only show Previous Track item if clicking previous is possible */
action = parole_provider_player_get_action(PAROLE_PROVIDER_PLAYER(notify->player), PAROLE_PLAYER_ACTION_PREVIOUS);
- g_object_get (G_OBJECT (action),
+ g_object_get(G_OBJECT(action),
"enabled", &enabled,
NULL);
if (enabled)
{
- notify_notification_add_action (notify->notification,
+ notify_notification_add_action(notify->notification,
"play-previous", _("Previous Track"),
NOTIFY_ACTION_CALLBACK(on_previous_clicked),
notify, NULL);
@@ -208,79 +208,79 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
/* Only show Next Track item if clicking next is possible */
action = parole_provider_player_get_action(PAROLE_PROVIDER_PLAYER(notify->player), PAROLE_PLAYER_ACTION_NEXT);
- g_object_get (G_OBJECT (action),
+ g_object_get(G_OBJECT(action),
"enabled", &enabled,
NULL);
if (enabled)
{
- notify_notification_add_action (notify->notification,
+ notify_notification_add_action(notify->notification,
"play-next", _("Next Track"),
NOTIFY_ACTION_CALLBACK(on_next_clicked),
notify, NULL);
}
- notify_notification_show (notify->notification, NULL);
- g_signal_connect (notify->notification, "closed",
- G_CALLBACK (notification_closed_cb), notify);
+ notify_notification_show(notify->notification, NULL);
+ g_signal_connect(notify->notification, "closed",
+ G_CALLBACK(notification_closed_cb), notify);
}
static void
-state_changed_cb (ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, NotifyProvider *notify)
+state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, NotifyProvider *notify)
{
if ( state == PAROLE_STATE_PLAYING )
- notify_playing (notify, stream);
+ notify_playing(notify, stream);
else if ( state <= PAROLE_STATE_PAUSED )
- close_notification (notify);
+ close_notification(notify);
}
-static gboolean notify_provider_is_configurable (ParoleProviderPlugin *plugin)
+static gboolean notify_provider_is_configurable(ParoleProviderPlugin *plugin)
{
return FALSE;
}
static void
-notify_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
+notify_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
{
NotifyProvider *notify;
- notify = NOTIFY_PROVIDER (plugin);
+ notify = NOTIFY_PROVIDER(plugin);
notify->player = player;
notify->notification = NULL;
- notify_init ("parole-notify");
+ notify_init("parole-notify");
- g_signal_connect (player, "state_changed",
- G_CALLBACK (state_changed_cb), notify);
+ g_signal_connect(player, "state_changed",
+ G_CALLBACK(state_changed_cb), notify);
}
static void
-notify_provider_iface_init (ParoleProviderPluginIface *iface)
+notify_provider_iface_init(ParoleProviderPluginIface *iface)
{
iface->get_is_configurable = notify_provider_is_configurable;
iface->set_player = notify_provider_set_player;
}
-static void notify_provider_class_init (NotifyProviderClass *klass)
+static void notify_provider_class_init(NotifyProviderClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = notify_provider_finalize;
}
-static void notify_provider_init (NotifyProvider *provider)
+static void notify_provider_init(NotifyProvider *provider)
{
provider->player = NULL;
}
-static void notify_provider_finalize (GObject *object)
+static void notify_provider_finalize(GObject *object)
{
NotifyProvider *notify;
- notify = NOTIFY_PROVIDER (object);
+ notify = NOTIFY_PROVIDER(object);
- close_notification (notify);
+ close_notification(notify);
- G_OBJECT_CLASS (notify_provider_parent_class)->finalize (object);
+ G_OBJECT_CLASS(notify_provider_parent_class)->finalize(object);
}
diff --git a/src/plugins/sample/sample-plugin.c b/src/plugins/sample/sample-plugin.c
index 4975abe..295838f 100644
--- a/src/plugins/sample/sample-plugin.c
+++ b/src/plugins/sample/sample-plugin.c
@@ -28,19 +28,19 @@
#include "sample-provider.h"
-G_MODULE_EXPORT GType parole_plugin_initialize (ParoleProviderPlugin *plugin);
+G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
-G_MODULE_EXPORT void parole_plugin_shutdown (void);
+G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize (ParoleProviderPlugin *plugin)
+parole_plugin_initialize(ParoleProviderPlugin *plugin)
{
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- sample_provider_register_type (plugin);
+ xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ sample_provider_register_type(plugin);
return SAMPLE_TYPE_PROVIDER;
}
G_MODULE_EXPORT void
-parole_plugin_shutdown (void)
+parole_plugin_shutdown(void)
{
}
diff --git a/src/plugins/sample/sample-provider.c b/src/plugins/sample/sample-provider.c
index 7c2ca34..d372c89 100644
--- a/src/plugins/sample/sample-provider.c
+++ b/src/plugins/sample/sample-provider.c
@@ -26,8 +26,8 @@
#include "sample-provider.h"
-static void sample_provider_iface_init (ParoleProviderPluginIface *iface);
-static void sample_provider_finalize (GObject *object);
+static void sample_provider_iface_init(ParoleProviderPluginIface *iface);
+static void sample_provider_finalize(GObject *object);
struct _SampleProviderClass
@@ -41,46 +41,46 @@ struct _SampleProvider
ParoleProviderPlayer *player;
};
-PAROLE_DEFINE_TYPE_WITH_CODE (SampleProvider,
+PAROLE_DEFINE_TYPE_WITH_CODE(SampleProvider,
sample_provider,
G_TYPE_OBJECT,
- PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN,
+ PAROLE_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLUGIN,
sample_provider_iface_init));
-static gboolean sample_provider_is_configurable (ParoleProviderPlugin *plugin)
+static gboolean sample_provider_is_configurable(ParoleProviderPlugin *plugin)
{
return FALSE;
}
static void
-sample_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
+sample_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
{
SampleProvider *provider;
- provider = SAMPLE_PROVIDER (plugin);
+ provider = SAMPLE_PROVIDER(plugin);
provider->player = player;
}
static void
-sample_provider_iface_init (ParoleProviderPluginIface *iface)
+sample_provider_iface_init(ParoleProviderPluginIface *iface)
{
iface->get_is_configurable = sample_provider_is_configurable;
iface->set_player = sample_provider_set_player;
}
-static void sample_provider_class_init (SampleProviderClass *klass)
+static void sample_provider_class_init(SampleProviderClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = sample_provider_finalize;
}
-static void sample_provider_init (SampleProvider *provider)
+static void sample_provider_init(SampleProvider *provider)
{
provider->player = NULL;
}
-static void sample_provider_finalize (GObject *object)
+static void sample_provider_finalize(GObject *object)
{
- G_OBJECT_CLASS (sample_provider_parent_class)->finalize (object);
+ G_OBJECT_CLASS(sample_provider_parent_class)->finalize(object);
}
diff --git a/src/plugins/tray/tray-plugin.c b/src/plugins/tray/tray-plugin.c
index 95c2547..2058fbf 100644
--- a/src/plugins/tray/tray-plugin.c
+++ b/src/plugins/tray/tray-plugin.c
@@ -28,21 +28,21 @@
#include "tray-provider.h"
-G_MODULE_EXPORT GType parole_plugin_initialize (ParoleProviderPlugin *plugin);
+G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
-G_MODULE_EXPORT void parole_plugin_shutdown (void);
+G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize (ParoleProviderPlugin *plugin)
+parole_plugin_initialize(ParoleProviderPlugin *plugin)
{
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- tray_provider_register_type (plugin);
+ tray_provider_register_type(plugin);
return TRAY_TYPE_PROVIDER;
}
G_MODULE_EXPORT void
-parole_plugin_shutdown (void)
+parole_plugin_shutdown(void)
{
}
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 880335b..36be712 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -36,8 +36,8 @@
#include "tray-provider.h"
-static void tray_provider_iface_init (ParoleProviderPluginIface *iface);
-static void tray_provider_finalize (GObject *object);
+static void tray_provider_iface_init(ParoleProviderPluginIface *iface);
+static void tray_provider_finalize(GObject *object);
struct _TrayProviderClass
@@ -57,145 +57,145 @@ struct _TrayProvider
GtkWidget *menu;
};
-PAROLE_DEFINE_TYPE_WITH_CODE (TrayProvider,
+PAROLE_DEFINE_TYPE_WITH_CODE(TrayProvider,
tray_provider,
G_TYPE_OBJECT,
- PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN,
+ PAROLE_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLUGIN,
tray_provider_iface_init));
static void
-menu_selection_done_cb (TrayProvider *tray)
+menu_selection_done_cb(TrayProvider *tray)
{
- gtk_widget_destroy (tray->menu);
+ gtk_widget_destroy(tray->menu);
tray->menu = NULL;
}
static void
-exit_activated_cb (TrayProvider *tray)
+exit_activated_cb(TrayProvider *tray)
{
GdkEventAny ev;
- menu_selection_done_cb (tray);
+ menu_selection_done_cb(tray);
ev.type = GDK_DELETE;
ev.window = gtk_widget_get_window(tray->window);
ev.send_event = TRUE;
- g_signal_handler_block (tray->window, tray->sig);
- gtk_main_do_event ((GdkEvent *) &ev);
+ g_signal_handler_block(tray->window, tray->sig);
+ gtk_main_do_event((GdkEvent *) &ev);
}
static void
-play_pause_activated_cb (TrayProvider *tray)
+play_pause_activated_cb(TrayProvider *tray)
{
- menu_selection_done_cb (tray);
+ menu_selection_done_cb(tray);
if ( tray->state == PAROLE_STATE_PLAYING )
- parole_provider_player_pause (tray->player);
+ parole_provider_player_pause(tray->player);
else if ( tray->state == PAROLE_STATE_PAUSED )
- parole_provider_player_resume (tray->player);
+ parole_provider_player_resume(tray->player);
}
static void
-previous_activated_cb (TrayProvider *tray)
+previous_activated_cb(TrayProvider *tray)
{
- menu_selection_done_cb (tray);
- parole_provider_player_play_previous (tray->player);
+ menu_selection_done_cb(tray);
+ parole_provider_player_play_previous(tray->player);
}
static void
-next_activated_cb (TrayProvider *tray)
+next_activated_cb(TrayProvider *tray)
{
- menu_selection_done_cb (tray);
- parole_provider_player_play_next (tray->player);
+ menu_selection_done_cb(tray);
+ parole_provider_player_play_next(tray->player);
}
static void
-open_activated_cb (TrayProvider *tray)
+open_activated_cb(TrayProvider *tray)
{
- parole_provider_player_open_media_chooser (tray->player);
+ parole_provider_player_open_media_chooser(tray->player);
}
static void
-popup_menu_cb (GtkStatusIcon *icon, guint button,
+popup_menu_cb(GtkStatusIcon *icon, guint button,
guint activate_time, TrayProvider *tray)
{
GtkWidget *menu, *mi;
- menu = gtk_menu_new ();
+ menu = gtk_menu_new();
/*
* Play pause
*/
mi = gtk_menu_item_new_with_mnemonic(tray->state == PAROLE_STATE_PLAYING ? _("_Pause") : _("_Play"));
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate", G_CALLBACK (play_pause_activated_cb), tray);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_widget_set_sensitive(mi, TRUE);
+ gtk_widget_show(mi);
+ g_signal_connect_swapped(mi, "activate", G_CALLBACK(play_pause_activated_cb), tray);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Previous Track
*/
mi = gtk_menu_item_new_with_mnemonic(_("P_revious Track"));
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate", G_CALLBACK (previous_activated_cb), tray);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_widget_set_sensitive(mi, TRUE);
+ gtk_widget_show(mi);
+ g_signal_connect_swapped(mi, "activate", G_CALLBACK(previous_activated_cb), tray);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Next Track
*/
mi = gtk_menu_item_new_with_mnemonic(_("_Next Track"));
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate", G_CALLBACK (next_activated_cb), tray);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_widget_set_sensitive(mi, TRUE);
+ gtk_widget_show(mi);
+ g_signal_connect_swapped(mi, "activate", G_CALLBACK(next_activated_cb), tray);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Separator
*/
- mi = gtk_separator_menu_item_new ();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Open
*/
mi = gtk_menu_item_new_with_mnemonic(_("_Open"));
- gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate", G_CALLBACK (open_activated_cb), tray);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_widget_show(mi);
+ g_signal_connect_swapped(mi, "activate", G_CALLBACK(open_activated_cb), tray);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Separator.
*/
- mi = gtk_separator_menu_item_new ();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
* Exit
*/
mi = gtk_menu_item_new_with_mnemonic(_("_Quit"));
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate", G_CALLBACK (exit_activated_cb), tray);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_widget_set_sensitive(mi, TRUE);
+ gtk_widget_show(mi);
+ g_signal_connect_swapped(mi, "activate", G_CALLBACK(exit_activated_cb), tray);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+ gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
gtk_status_icon_position_menu,
icon, button, activate_time);
G_GNUC_END_IGNORE_DEPRECATIONS
- g_signal_connect_swapped (menu, "selection-done",
- G_CALLBACK (menu_selection_done_cb), tray);
+ g_signal_connect_swapped(menu, "selection-done",
+ G_CALLBACK(menu_selection_done_cb), tray);
tray->menu = menu;
}
static void
-tray_activate_cb (GtkStatusIcon *tray_icon, TrayProvider *tray)
+tray_activate_cb(GtkStatusIcon *tray_icon, TrayProvider *tray)
{
/* Show the window if it is hidden or does not have focus */
if (!gtk_widget_get_visible(tray->window) || !gtk_window_is_active(GTK_WINDOW(tray->window)))
@@ -205,27 +205,27 @@ tray_activate_cb (GtkStatusIcon *tray_icon, TrayProvider *tray)
}
static void
-state_changed_cb (ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, TrayProvider *tray)
+state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, TrayProvider *tray)
{
tray->state = state;
if ( tray->menu )
{
- gtk_widget_destroy (tray->menu);
+ gtk_widget_destroy(tray->menu);
tray->menu = NULL;
- g_signal_emit_by_name (G_OBJECT (tray->tray), "popup-menu", 0, gtk_get_current_event_time ());
+ g_signal_emit_by_name(G_OBJECT(tray->tray), "popup-menu", 0, gtk_get_current_event_time());
}
}
static gboolean
-read_entry_bool (const gchar *entry, gboolean fallback)
+read_entry_bool(const gchar *entry, gboolean fallback)
{
XfconfChannel *channel;
gboolean ret_val = fallback;
gchar prop_name[64];
GValue src = { 0, };
- channel = xfconf_channel_get ("parole");
+ channel = xfconf_channel_get("parole");
g_snprintf (prop_name, sizeof (prop_name), "/plugins/tray/%s", entry);
g_value_init(&src, G_TYPE_BOOLEAN);
@@ -237,31 +237,31 @@ read_entry_bool (const gchar *entry, gboolean fallback)
}
static void
-write_entry_bool (const gchar *entry, gboolean value)
+write_entry_bool(const gchar *entry, gboolean value)
{
XfconfChannel *channel;
gchar prop_name[64];
GValue dst = { 0, };
- channel = xfconf_channel_get ("parole");
+ channel = xfconf_channel_get("parole");
g_snprintf (prop_name, sizeof (prop_name), "/plugins/tray/%s", entry);
g_value_init(&dst, G_TYPE_BOOLEAN);
g_value_set_boolean(&dst, value);
- xfconf_channel_set_property (channel, prop_name, &dst);
+ xfconf_channel_set_property(channel, prop_name, &dst);
}
static void
-hide_on_delete_toggled_cb (GtkWidget *widget, gpointer tray)
+hide_on_delete_toggled_cb(GtkWidget *widget, gpointer tray)
{
gboolean toggled;
- toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- write_entry_bool ("minimize-to-tray", toggled);
+ toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ write_entry_bool("minimize-to-tray", toggled);
}
static void
-configure_plugin (TrayProvider *tray, GtkWidget *widget)
+configure_plugin(TrayProvider *tray, GtkWidget *widget)
{
GtkWidget *dialog;
GtkWidget *content_area;
@@ -269,49 +269,49 @@ configure_plugin (TrayProvider *tray, GtkWidget *widget)
GtkWidget *hide_on_delete;
gboolean hide_on_delete_b;
- dialog = gtk_dialog_new_with_buttons (_("Tray icon plugin"),
- GTK_WINDOW (widget),
+ dialog = gtk_dialog_new_with_buttons(_("Tray icon plugin"),
+ GTK_WINDOW(widget),
GTK_DIALOG_DESTROY_WITH_PARENT,
_("Close"),
GTK_RESPONSE_CANCEL,
NULL);
- content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
- hide_on_delete_b = read_entry_bool ("minimize-to-tray", TRUE);
- hide_on_delete = gtk_check_button_new_with_label (_("Always minimize to tray when window is closed"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (hide_on_delete), hide_on_delete_b);
+ hide_on_delete_b = read_entry_bool("minimize-to-tray", TRUE);
+ hide_on_delete = gtk_check_button_new_with_label(_("Always minimize to tray when window is closed"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_on_delete), hide_on_delete_b);
- g_signal_connect (hide_on_delete, "toggled",
- G_CALLBACK (hide_on_delete_toggled_cb), NULL);
+ g_signal_connect(hide_on_delete, "toggled",
+ G_CALLBACK(hide_on_delete_toggled_cb), NULL);
- gtk_box_pack_start (GTK_BOX (content_area), hide_on_delete, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(content_area), hide_on_delete, TRUE, TRUE, 0);
- g_signal_connect (dialog, "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect(dialog, "response",
+ G_CALLBACK(gtk_widget_destroy), NULL);
- gtk_widget_show_all (dialog);
+ gtk_widget_show_all(dialog);
}
static void
-action_on_hide_confirmed_cb (GtkWidget *widget, gpointer data)
+action_on_hide_confirmed_cb(GtkWidget *widget, gpointer data)
{
gboolean toggled;
- toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+ toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- write_entry_bool ("remember-quit-action", toggled);
+ write_entry_bool("remember-quit-action", toggled);
}
static gboolean
-delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
+delete_event_cb(GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
{
GtkWidget *dialog, *check, *content_area, *button;
GtkWidget *minimize, *img;
gboolean confirmed, ret_val = TRUE, minimize_to_tray;
- confirmed = read_entry_bool ("remember-quit-action", FALSE);
- minimize_to_tray = read_entry_bool ("minimize-to-tray", TRUE);
+ confirmed = read_entry_bool("remember-quit-action", FALSE);
+ minimize_to_tray = read_entry_bool("minimize-to-tray", TRUE);
if ( confirmed )
{
@@ -324,43 +324,43 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
GTK_BUTTONS_NONE,
NULL);
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dialog),
+ gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog),
g_strdup_printf("<big><b>%s</b></big>", _("Are you sure you want to quit?")));
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
_("Parole can be minimized to the system tray instead."));
minimize = gtk_dialog_add_button(GTK_DIALOG(dialog),
_("Minimize to tray"),
GTK_RESPONSE_OK);
- img = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (minimize), img);
+ img = gtk_image_new_from_icon_name("go-down", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(minimize), img);
button = gtk_dialog_add_button(GTK_DIALOG(dialog),
_("Cancel"),
GTK_RESPONSE_CANCEL);
- img = gtk_image_new_from_icon_name ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
+ img = gtk_image_new_from_icon_name("gtk-cancel", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(button), img);
button = gtk_dialog_add_button(GTK_DIALOG(dialog),
_("Quit"),
GTK_RESPONSE_CLOSE);
- img = gtk_image_new_from_icon_name ("gtk-quit", GTK_ICON_SIZE_BUTTON);
+ img = gtk_image_new_from_icon_name("gtk-quit", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(button), img);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
- check = gtk_check_button_new_with_mnemonic (_("Remember my choice"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
+ check = gtk_check_button_new_with_mnemonic(_("Remember my choice"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), FALSE);
- g_signal_connect (check, "toggled",
- G_CALLBACK (action_on_hide_confirmed_cb), NULL);
+ g_signal_connect(check, "toggled",
+ G_CALLBACK(action_on_hide_confirmed_cb), NULL);
- gtk_box_pack_start (GTK_BOX (content_area), check, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(content_area), check, TRUE, TRUE, 0);
- gtk_widget_set_margin_start (GTK_WIDGET(check), 3);
+ gtk_widget_set_margin_start(GTK_WIDGET(check), 3);
gtk_widget_show_all(GTK_WIDGET(dialog));
@@ -368,17 +368,17 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
{
case GTK_RESPONSE_OK:
{
- gtk_widget_hide_on_delete (widget);
- confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+ gtk_widget_hide_on_delete(widget);
+ confirmed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
if ( confirmed )
- write_entry_bool ("minimize-to-tray", TRUE);
+ write_entry_bool("minimize-to-tray", TRUE);
break;
}
case GTK_RESPONSE_CLOSE:
{
- confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+ confirmed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
if ( confirmed )
- write_entry_bool ("minimize-to-tray", FALSE);
+ write_entry_bool("minimize-to-tray", FALSE);
ret_val = FALSE;
}
break;
@@ -388,37 +388,37 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
break;
}
- gtk_widget_destroy (dialog);
+ gtk_widget_destroy(dialog);
return ret_val;
}
-static gboolean tray_provider_is_configurable (ParoleProviderPlugin *plugin)
+static gboolean tray_provider_is_configurable(ParoleProviderPlugin *plugin)
{
return TRUE;
}
static void
-tray_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
+tray_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
{
TrayProvider *tray;
GdkPixbuf *pix;
- tray = TRAY_PROVIDER (plugin);
+ tray = TRAY_PROVIDER(plugin);
tray->player = player;
tray->state = PAROLE_STATE_STOPPED;
- tray->window = parole_provider_player_get_main_window (player);
+ tray->window = parole_provider_player_get_main_window(player);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- tray->tray = gtk_status_icon_new ();
+ tray->tray = gtk_status_icon_new();
G_GNUC_END_IGNORE_DEPRECATIONS
tray->player = player;
tray->menu = NULL;
- pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
"parole",
48,
GTK_ICON_LOOKUP_USE_BUILTIN,
@@ -427,63 +427,63 @@ tray_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *pl
if ( pix )
{
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_status_icon_set_from_pixbuf (tray->tray, pix);
+ gtk_status_icon_set_from_pixbuf(tray->tray, pix);
G_GNUC_END_IGNORE_DEPRECATIONS
- g_object_unref (pix);
+ g_object_unref(pix);
}
- g_signal_connect (tray->tray, "popup-menu",
- G_CALLBACK (popup_menu_cb), tray);
+ g_signal_connect(tray->tray, "popup-menu",
+ G_CALLBACK(popup_menu_cb), tray);
- g_signal_connect (tray->tray, "activate",
- G_CALLBACK (tray_activate_cb), tray);
+ g_signal_connect(tray->tray, "activate",
+ G_CALLBACK(tray_activate_cb), tray);
- tray->sig = g_signal_connect (tray->window, "delete-event",
- G_CALLBACK (delete_event_cb), NULL);
+ tray->sig = g_signal_connect(tray->window, "delete-event",
+ G_CALLBACK(delete_event_cb), NULL);
- g_signal_connect (player, "state_changed",
- G_CALLBACK (state_changed_cb), tray);
+ g_signal_connect(player, "state_changed",
+ G_CALLBACK(state_changed_cb), tray);
}
static void
-tray_provider_configure (ParoleProviderPlugin *provider, GtkWidget *parent)
+tray_provider_configure(ParoleProviderPlugin *provider, GtkWidget *parent)
{
TrayProvider *tray;
- tray = TRAY_PROVIDER (provider);
- configure_plugin (tray, parent);
+ tray = TRAY_PROVIDER(provider);
+ configure_plugin(tray, parent);
}
static void
-tray_provider_iface_init (ParoleProviderPluginIface *iface)
+tray_provider_iface_init(ParoleProviderPluginIface *iface)
{
iface->set_player = tray_provider_set_player;
iface->configure = tray_provider_configure;
iface->get_is_configurable = tray_provider_is_configurable;
}
-static void tray_provider_class_init (TrayProviderClass *klass)
+static void tray_provider_class_init(TrayProviderClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = tray_provider_finalize;
}
-static void tray_provider_init (TrayProvider *provider)
+static void tray_provider_init(TrayProvider *provider)
{
provider->player = NULL;
}
-static void tray_provider_finalize (GObject *object)
+static void tray_provider_finalize(GObject *object)
{
TrayProvider *tray;
- tray = TRAY_PROVIDER (object);
+ tray = TRAY_PROVIDER(object);
if ( GTK_IS_WIDGET (tray->window) && g_signal_handler_is_connected (tray->window, tray->sig) )
- g_signal_handler_disconnect (tray->window, tray->sig);
+ g_signal_handler_disconnect(tray->window, tray->sig);
- g_object_unref (G_OBJECT (tray->tray));
+ g_object_unref(G_OBJECT(tray->tray));
- G_OBJECT_CLASS (tray_provider_parent_class)->finalize (object);
+ G_OBJECT_CLASS(tray_provider_parent_class)->finalize(object);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list