[Xfce4-commits] <parole:0.2.2> Get rid of the old PAROLE_MEDIA_STATE enum and just use PAROLE_STATE enum .
Ali Abdallah
noreply at xfce.org
Wed Dec 15 18:32:01 CET 2010
Updating branch refs/heads/0.2.2
to cd7fd90fdc0e7415f5c35c57627d262b78820360 (commit)
from 294293148da04d171f5798b6b7b982fe7db78e8f (commit)
commit cd7fd90fdc0e7415f5c35c57627d262b78820360
Author: Ali Abdallah <aliov at xfce.org>
Date: Wed Dec 15 17:32:16 2010 +0100
Get rid of the old PAROLE_MEDIA_STATE enum and just
use PAROLE_STATE enum .
gst/parole-gst.c | 28 +++++++++++++-------------
gst/parole-gst.h | 18 ++--------------
parole/parole-provider-player.h | 9 +-------
parole/parole-stream.h | 11 ++++++++++
src/parole-player.c | 40 +++++++++++++++++++-------------------
src/parole-plugin-player.c | 2 +-
src/parole-statusbar.c | 24 +++++++++++-----------
7 files changed, 62 insertions(+), 70 deletions(-)
diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index 9c39233..9701b35 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -72,7 +72,7 @@ struct ParoleGstPrivate
GMutex *lock;
GstState state;
GstState target;
- ParoleMediaState media_state;
+ ParoleState media_state;
ParoleStream *stream;
gulong tick_id;
@@ -860,9 +860,9 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
{
case GST_STATE_PLAYING:
{
- gst->priv->media_state = PAROLE_MEDIA_STATE_PLAYING;
+ gst->priv->media_state = PAROLE_STATE_PLAYING;
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
- gst->priv->stream, PAROLE_MEDIA_STATE_PLAYING);
+ gst->priv->stream, PAROLE_STATE_PLAYING);
break;
}
case GST_STATE_PAUSED:
@@ -890,17 +890,17 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
parole_gst_set_video_color_balance (gst);
}
- gst->priv->media_state = PAROLE_MEDIA_STATE_PAUSED;
+ gst->priv->media_state = PAROLE_STATE_PAUSED;
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
- gst->priv->stream, PAROLE_MEDIA_STATE_PAUSED);
+ gst->priv->stream, PAROLE_STATE_PAUSED);
break;
}
case GST_STATE_READY:
{
gst->priv->buffering = FALSE;
- gst->priv->media_state = PAROLE_MEDIA_STATE_STOPPED;
+ gst->priv->media_state = PAROLE_STATE_STOPPED;
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
- gst->priv->stream, PAROLE_MEDIA_STATE_STOPPED);
+ gst->priv->stream, PAROLE_STATE_STOPPED);
if ( gst->priv->target == GST_STATE_PLAYING && pending < GST_STATE_PAUSED)
{
@@ -920,9 +920,9 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
case GST_STATE_NULL:
{
gst->priv->buffering = FALSE;
- gst->priv->media_state = PAROLE_MEDIA_STATE_STOPPED;
+ gst->priv->media_state = PAROLE_STATE_STOPPED;
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
- gst->priv->stream, PAROLE_MEDIA_STATE_STOPPED);
+ gst->priv->stream, PAROLE_STATE_STOPPED);
break;
}
default:
@@ -1102,9 +1102,9 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
}
}
- gst->priv->media_state = PAROLE_MEDIA_STATE_FINISHED;
+ gst->priv->media_state = PAROLE_STATE_PLAYBACK_FINISHED;
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
- gst->priv->stream, PAROLE_MEDIA_STATE_FINISHED);
+ gst->priv->stream, PAROLE_STATE_PLAYBACK_FINISHED);
break;
}
case GST_MESSAGE_ERROR:
@@ -1702,7 +1702,7 @@ parole_gst_class_init (ParoleGstClass *klass)
NULL, NULL,
_gmarshal_VOID__OBJECT_ENUM,
G_TYPE_NONE, 2,
- PAROLE_TYPE_STREAM, GST_ENUM_TYPE_MEDIA_STATE);
+ PAROLE_TYPE_STREAM, PAROLE_ENUM_TYPE_STATE);
signals[MEDIA_PROGRESSED] =
g_signal_new ("media-progressed",
@@ -1768,7 +1768,7 @@ parole_gst_init (ParoleGst *gst)
gst->priv->state = GST_STATE_VOID_PENDING;
gst->priv->target = GST_STATE_VOID_PENDING;
- gst->priv->media_state = PAROLE_MEDIA_STATE_STOPPED;
+ gst->priv->media_state = PAROLE_STATE_STOPPED;
gst->priv->aspect_ratio = PAROLE_ASPECT_RATIO_NONE;
gst->priv->lock = g_mutex_new ();
gst->priv->stream = parole_stream_new ();
@@ -2000,7 +2000,7 @@ gdouble parole_gst_get_volume (ParoleGst *gst)
return volume;
}
-ParoleMediaState parole_gst_get_state (ParoleGst *gst)
+ParoleState parole_gst_get_state (ParoleGst *gst)
{
return gst->priv->media_state;
}
diff --git a/gst/parole-gst.h b/gst/parole-gst.h
index 1beabe6..cb3265f 100644
--- a/gst/parole-gst.h
+++ b/gst/parole-gst.h
@@ -26,6 +26,7 @@
#include <gtk/gtk.h>
#include <parole/parole-stream.h>
+#include <parole/parole-enum-types.h>
G_BEGIN_DECLS
@@ -33,19 +34,6 @@ G_BEGIN_DECLS
#define PAROLE_GST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_GST, ParoleGst))
#define PAROLE_IS_GST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_GST))
-/*
- * Keep this order to be compatible with the
- * ParoleState enum used by the plugin interface.
- */
-typedef enum /*< prefix=PAROLE_MEDIA_STATE_ >*/
-{
- PAROLE_MEDIA_STATE_STOPPED,
- PAROLE_MEDIA_STATE_FINISHED,
- PAROLE_MEDIA_STATE_PAUSED,
- PAROLE_MEDIA_STATE_PLAYING
-
-} ParoleMediaState;
-
typedef enum
{
PAROLE_ASPECT_RATIO_NONE,
@@ -72,7 +60,7 @@ typedef struct
void (*media_state) (ParoleGst *gst,
const ParoleStream *stream,
- ParoleMediaState state);
+ ParoleState state);
void (*media_progressed) (ParoleGst *gst,
const ParoleStream *stream,
@@ -122,7 +110,7 @@ void parole_gst_set_volume (ParoleGst *gst,
gdouble parole_gst_get_volume (ParoleGst *gst);
-ParoleMediaState parole_gst_get_state (ParoleGst *gst);
+ParoleState parole_gst_get_state (ParoleGst *gst);
GstState parole_gst_get_gst_state (ParoleGst *gst);
diff --git a/parole/parole-provider-player.h b/parole/parole-provider-player.h
index 6373121..2d2c451 100644
--- a/parole/parole-provider-player.h
+++ b/parole/parole-provider-player.h
@@ -44,14 +44,7 @@ typedef enum
PAROLE_PLUGIN_CONTAINER_MAIN_VIEW
} ParolePluginContainer;
-typedef enum
-{
- PAROLE_STATE_STOPPED = 0,
- PAROLE_STATE_PLAYBACK_FINISHED,
- PAROLE_STATE_PAUSED,
- PAROLE_STATE_PLAYING
-
-} ParoleState;
+
struct _ParoleProviderPlayerIface
{
diff --git a/parole/parole-stream.h b/parole/parole-stream.h
index 3df8e77..157598d 100644
--- a/parole/parole-stream.h
+++ b/parole/parole-stream.h
@@ -46,6 +46,17 @@ typedef enum
} ParoleMediaType;
+
+typedef enum
+{
+ PAROLE_STATE_STOPPED = 0,
+ PAROLE_STATE_PLAYBACK_FINISHED,
+ PAROLE_STATE_PAUSED,
+ PAROLE_STATE_PLAYING
+
+} ParoleState;
+
+
typedef struct _ParoleStream ParoleStream;
typedef struct _ParoleStreamClass ParoleStreamClass;
diff --git a/src/parole-player.c b/src/parole-player.c
index d42c7fb..599bdd0 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -286,7 +286,7 @@ struct _ParolePlayer
gboolean full_screen;
gboolean minimized;
- ParoleMediaState state;
+ ParoleState state;
gboolean user_seeking;
gboolean internal_range_change;
gboolean buffering;
@@ -498,7 +498,7 @@ parole_player_uri_opened_cb (ParoleMediaList *list, const gchar *uri, ParolePlay
static void
parole_player_media_cursor_changed_cb (ParoleMediaList *list, gboolean media_selected, ParolePlayer *player)
{
- if (player->state < PAROLE_MEDIA_STATE_PAUSED)
+ if (player->state < PAROLE_STATE_PAUSED)
{
gtk_widget_set_sensitive (player->play_pause,
media_selected || !parole_media_list_is_empty (player->list));
@@ -512,7 +512,7 @@ parole_player_media_progressed_cb (ParoleGst *gst, const ParoleStream *stream, g
g_return_if_fail (value > 0);
#endif
- if ( !player->user_seeking && player->state == PAROLE_MEDIA_STATE_PLAYING )
+ if ( !player->user_seeking && player->state == PAROLE_STATE_PLAYING )
{
parole_player_change_range_value (player, value);
}
@@ -793,7 +793,7 @@ parole_player_reset_saver_changed (ParolePlayer *player, const ParoleStream *str
if ( !reset_saver )
parole_screen_saver_uninhibit (player->screen_saver);
- else if ( player->state == PAROLE_MEDIA_STATE_PLAYING )
+ else if ( player->state == PAROLE_STATE_PLAYING )
{
gboolean has_video;
@@ -811,28 +811,28 @@ parole_player_reset_saver_changed (ParolePlayer *player, const ParoleStream *str
}
static void
-parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, ParoleMediaState state, ParolePlayer *player)
+parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, ParoleState state, ParolePlayer *player)
{
- PAROLE_DEBUG_ENUM ("State callback", state, GST_ENUM_TYPE_MEDIA_STATE);
+ PAROLE_DEBUG_ENUM ("State callback", state, PAROLE_ENUM_TYPE_STATE);
player->state = state;
parole_player_reset_saver_changed (player, stream);
- if ( state == PAROLE_MEDIA_STATE_PLAYING )
+ if ( state == PAROLE_STATE_PLAYING )
{
parole_player_playing (player, stream);
}
- else if ( state == PAROLE_MEDIA_STATE_PAUSED )
+ else if ( state == PAROLE_STATE_PAUSED )
{
parole_player_paused (player);
}
- else if ( state == PAROLE_MEDIA_STATE_STOPPED )
+ else if ( state == PAROLE_STATE_STOPPED )
{
parole_player_stopped (player);
}
- else if ( state == PAROLE_MEDIA_STATE_FINISHED )
+ else if ( state == PAROLE_STATE_PLAYBACK_FINISHED )
{
TRACE ("***Playback finished***");
parole_player_play_next (player, TRUE);
@@ -842,9 +842,9 @@ parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, Parole
void
parole_player_play_pause_clicked (GtkButton *button, ParolePlayer *player)
{
- if ( player->state == PAROLE_MEDIA_STATE_PLAYING )
+ if ( player->state == PAROLE_STATE_PLAYING )
parole_gst_pause (PAROLE_GST (player->gst));
- else if ( player->state == PAROLE_MEDIA_STATE_PAUSED )
+ else if ( player->state == PAROLE_STATE_PAUSED )
parole_gst_resume (PAROLE_GST (player->gst));
else
parole_player_play_selected_row (player);
@@ -1014,7 +1014,7 @@ parole_player_buffering_cb (ParoleGst *gst, const ParoleStream *stream, gint per
{
player->buffering = TRUE;
- if ( player->state == PAROLE_MEDIA_STATE_PLAYING )
+ if ( player->state == PAROLE_STATE_PLAYING )
parole_gst_pause (PAROLE_GST (player->gst));
}
}
@@ -1182,7 +1182,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
/*Play menu item
*/
- mi = gtk_image_menu_item_new_from_stock (player->state == PAROLE_MEDIA_STATE_PLAYING
+ mi = gtk_image_menu_item_new_from_stock (player->state == PAROLE_STATE_PLAYING
? GTK_STOCK_MEDIA_PAUSE : GTK_STOCK_MEDIA_PLAY,
NULL);
@@ -1201,7 +1201,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
*/
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_FORWARD, NULL);
- gtk_widget_set_sensitive (mi, (player->state >= PAROLE_MEDIA_STATE_PAUSED));
+ gtk_widget_set_sensitive (mi, (player->state >= PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, "activate",
G_CALLBACK (parole_player_seekf_cb), player);
@@ -1212,7 +1212,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
*/
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_REWIND, NULL);
- gtk_widget_set_sensitive (mi, (player->state >= PAROLE_MEDIA_STATE_PAUSED));
+ gtk_widget_set_sensitive (mi, (player->state >= PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, "activate",
G_CALLBACK (parole_player_seekb_cb), player);
@@ -1223,7 +1223,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
*/
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_STOP, NULL);
- gtk_widget_set_sensitive (mi, player->state == PAROLE_MEDIA_STATE_PLAYING);
+ gtk_widget_set_sensitive (mi, player->state == PAROLE_STATE_PLAYING);
gtk_widget_show (mi);
g_signal_connect_swapped (mi, "activate",
G_CALLBACK (parole_player_stop_menu_item_activate), player);
@@ -1235,7 +1235,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
mi = gtk_image_menu_item_new_with_label (media_type == PAROLE_MEDIA_TYPE_CDDA ? _("Next Track") : _("Next Chapter"));
img = gtk_image_new_from_stock (GTK_STOCK_MEDIA_NEXT, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi),img);
- gtk_widget_set_sensitive (mi, (player->state == PAROLE_MEDIA_STATE_PLAYING));
+ gtk_widget_set_sensitive (mi, (player->state == PAROLE_STATE_PLAYING));
gtk_widget_show (mi);
// g_signal_connect_swapped (mi, "activate",
// G_CALLBACK (parole_player_next_menu_item_activate), player);
@@ -1248,7 +1248,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
img = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- gtk_widget_set_sensitive (mi, (player->state == PAROLE_MEDIA_STATE_PLAYING));
+ gtk_widget_set_sensitive (mi, (player->state == PAROLE_STATE_PLAYING));
gtk_widget_show (mi);
// g_signal_connect_swapped (mi, "activate",
// G_CALLBACK (parole_player_previous_menu_item_activate), player);
@@ -2065,7 +2065,7 @@ parole_player_init (ParolePlayer *player)
player->screen_saver = parole_screen_saver_new ();
player->list = PAROLE_MEDIA_LIST (parole_media_list_get ());
- player->state = PAROLE_MEDIA_STATE_STOPPED;
+ player->state = PAROLE_STATE_STOPPED;
player->user_seeking = FALSE;
player->internal_range_change = FALSE;
player->exit = FALSE;
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 889b35b..7a4ce40 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -188,7 +188,7 @@ static void parole_plugin_player_iface_init (ParoleProviderPlayerIface *iface)
static void
parole_plugin_player_media_state_changed_cb (ParoleGst *gst, const ParoleStream *stream,
- ParoleMediaState state, ParolePluginPlayer *player)
+ ParoleState state, ParolePluginPlayer *player)
{
g_signal_emit_by_name (G_OBJECT (player), "state-changed", stream, state);
}
diff --git a/src/parole-statusbar.c b/src/parole-statusbar.c
index 21c8dd1..0bc2687 100644
--- a/src/parole-statusbar.c
+++ b/src/parole-statusbar.c
@@ -91,15 +91,15 @@ get_time_string (gchar *timestring, gint total_seconds)
}
static void
-parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleMediaState state, gint64 position)
+parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleState state, gint64 position)
{
gchar *text = NULL;
- if ( state == PAROLE_MEDIA_STATE_STOPPED )
+ if ( state == PAROLE_STATE_STOPPED )
{
gtk_label_set_text (GTK_LABEL (bar->priv->label_duration), _("Stopped"));
}
- else if ( state == PAROLE_MEDIA_STATE_FINISHED )
+ else if ( state == PAROLE_STATE_PLAYBACK_FINISHED )
{
gtk_label_set_text (GTK_LABEL (bar->priv->label_duration), _("Finished"));
}
@@ -111,7 +111,7 @@ parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleMediaState state, gin
get_time_string (pos_text, position);
get_time_string (dur_text, bar->priv->duration);
text = g_strdup_printf ("%s %s/%s",
- state == PAROLE_MEDIA_STATE_PAUSED ? _("Paused") : _("Playing"),
+ state == PAROLE_STATE_PAUSED ? _("Paused") : _("Playing"),
pos_text,
dur_text);
}
@@ -121,11 +121,11 @@ parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleMediaState state, gin
g_free (text);
}
else
- gtk_label_set_text (GTK_LABEL (bar->priv->label_duration), state == PAROLE_MEDIA_STATE_PAUSED ? _("Paused") : ("Playing"));
+ gtk_label_set_text (GTK_LABEL (bar->priv->label_duration), state == PAROLE_STATE_PAUSED ? _("Paused") : ("Playing"));
}
}
-static void parole_statusbar_set_text (ParoleStatusbar *bar, const ParoleStream *stream, ParoleMediaState state)
+static void parole_statusbar_set_text (ParoleStatusbar *bar, const ParoleStream *stream, ParoleState state)
{
gchar *uri;
@@ -135,7 +135,7 @@ static void parole_statusbar_set_text (ParoleStatusbar *bar, const ParoleStream
"uri", &uri,
NULL);
- if ( state >= PAROLE_MEDIA_STATE_PAUSED && uri)
+ if ( state >= PAROLE_STATE_PAUSED && uri)
{
gchar *filename;
gchar *text = NULL;
@@ -184,9 +184,9 @@ static void parole_statusbar_set_text (ParoleStatusbar *bar, const ParoleStream
static void
parole_statusbar_state_changed_cb (ParoleGst *gst, const ParoleStream *stream,
- ParoleMediaState state, ParoleStatusbar *statusbar)
+ ParoleState state, ParoleStatusbar *statusbar)
{
- if ( state >= PAROLE_MEDIA_STATE_PAUSED )
+ if ( state >= PAROLE_STATE_PAUSED )
{
g_object_get (G_OBJECT (stream),
"duration", &statusbar->priv->duration,
@@ -198,7 +198,7 @@ parole_statusbar_state_changed_cb (ParoleGst *gst, const ParoleStream *stream,
statusbar->priv->pos = 0;
}
- if ( state < PAROLE_MEDIA_STATE_PAUSED )
+ if ( state < PAROLE_STATE_PAUSED )
gtk_widget_hide (statusbar->priv->progress);
parole_statusbar_set_text (statusbar, stream, state);
@@ -208,7 +208,7 @@ parole_statusbar_state_changed_cb (ParoleGst *gst, const ParoleStream *stream,
static void
parole_statusbar_tag_message_cb (ParoleGst *gst, const ParoleStream *stream, ParoleStatusbar *statusbar)
{
- ParoleMediaState state;
+ ParoleState state;
state = parole_gst_get_state (statusbar->priv->gst);
@@ -219,7 +219,7 @@ static void
parole_statusbar_progressed_cb (ParoleGst *gst, const ParoleStream *stream,
gint64 value, ParoleStatusbar *statusbar)
{
- ParoleMediaState state;
+ ParoleState state;
state = parole_gst_get_state (statusbar->priv->gst);
statusbar->priv->pos = value;
More information about the Xfce4-commits
mailing list