Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer/src
Modified Files:
callbacks.c eplayer.h interface.c interface.h
Log Message:
use bool, true and false instead of int, 1 and 0, where it's appropriate
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/callbacks.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- callbacks.c 31 Jan 2004 10:35:39 -0000 1.35
+++ callbacks.c 31 Jan 2004 10:55:25 -0000 1.36
@@ -263,7 +263,7 @@
EDJE_CB(seek_backward) {
PlayListItem *pli = playlist_current_item_get(player->playlist);
- int cur_time = pli->plugin->get_current_pos();
+ int cur_time = pli->plugin->get_current_pos();
debug(DEBUG_LEVEL_INFO, "Seeking backward - Current Pos: %i\n",
cur_time);
@@ -282,26 +282,26 @@
EDJE_CB(seek_forward_start) {
debug(DEBUG_LEVEL_INFO, "Start Seeking Forward");
- player->flags.seeking = 1;
+ player->flags.seeking = true;
player->flags.seek_dir = 1;
ecore_timer_add(.02, _eplayer_seek_timer, player);
}
EDJE_CB(seek_forward_stop) {
debug(DEBUG_LEVEL_INFO, "Stop Seeking Forward");
- player->flags.seeking = 0;
+ player->flags.seeking = false;
}
EDJE_CB(seek_backward_start) {
debug(DEBUG_LEVEL_INFO, "Start Seeking Backward");
- player->flags.seeking = 1;
+ player->flags.seeking = true;
player->flags.seek_dir = -1;
ecore_timer_add(.02, _eplayer_seek_timer, player);
}
EDJE_CB(seek_backward_stop) {
debug(DEBUG_LEVEL_INFO, "Stop Seeking Backward");
- player->flags.seeking = 0;
+ player->flags.seeking = false;
}
EDJE_CB(eplayer_quit) {
@@ -324,9 +324,9 @@
double pos;
if (!strcmp(emission, "SEEKER_START"))
- player->flags.seeker_seeking = 1;
+ player->flags.seeker_seeking = true;
else if (!strcmp(emission, "SEEKER_STOP"))
- player->flags.seeker_seeking = 0;
+ player->flags.seeker_seeking = false;
if (!player->flags.seeker_seeking)
return;
@@ -346,7 +346,7 @@
ex = event->x;
ey = event->y;
} else
- assert(0);
+ assert(false);
edje_object_part_geometry_get(player->gui.edje, "seeker_grabber",
&x, &y, &w, &h);
@@ -367,8 +367,11 @@
new_pos = pli->current_pos + player->flags.seek_dir;
- if (new_pos <= 0) new_pos = 0;
- if (new_pos > pli->duration) new_pos = pli->duration;
+ if (new_pos <= 0)
+ new_pos = 0;
+
+ if (new_pos > pli->duration)
+ new_pos = pli->duration;
track_position_set(player, new_pos);
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/eplayer.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- eplayer.h 31 Jan 2004 10:49:11 -0000 1.22
+++ eplayer.h 31 Jan 2004 10:55:25 -0000 1.23
@@ -18,7 +18,7 @@
char output_plugin[255];
char theme[255];
TimeDisplay time_display;
- int repeat;
+ bool repeat;
} Config;
typedef struct {
@@ -30,8 +30,8 @@
} Gui;
typedef struct {
- int seeker_seeking; /* 1 if seeking, 0 if not */
- int seeking;
+ bool seeker_seeking; /* true if seeking, false if not */
+ bool seeking;
int seek_dir;
} Flags;
@@ -44,10 +44,10 @@
pthread_t playback_thread;
pthread_mutex_t playback_stop_mutex;
- int playback_stop;
+ bool playback_stop;
pthread_mutex_t playback_next_mutex;
- int playback_next;
+ bool playback_next;
OutputPlugin *output;
Evas_List *input_plugins; /* lists all available input plugins */
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- interface.c 28 Jan 2004 11:17:38 -0000 1.41
+++ interface.c 31 Jan 2004 10:55:25 -0000 1.42
@@ -59,11 +59,11 @@
ecore_evas_raise(player->gui.ee);
}
-static int ui_init_dragger(ePlayer *player) {
+static bool ui_init_dragger(ePlayer *player) {
Evas_Object *dragger;
if (!(dragger = esmart_draggies_new(player->gui.ee)))
- return 0;
+ return false;
esmart_draggies_button_set(dragger, 1);
@@ -75,10 +75,10 @@
esmart_draggies_event_callback_add(dragger, EVAS_CALLBACK_MOUSE_UP,
cb_dragger_mouse_up, player);
- return 1;
+ return true;
}
-int ui_init(ePlayer *player) {
+bool ui_init(ePlayer *player) {
int zero = 0;
char buf[PATH_MAX];
@@ -89,7 +89,6 @@
ewl_init(&zero, NULL);
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, app_signal_exit,
NULL);
-
if (!strcasecmp(player->cfg.evas_engine, "gl")) {
debug(DEBUG_LEVEL_INFO, "Starting EVAS GL X11\n");
@@ -102,14 +101,12 @@
player->gui.ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 0, 0);
}
-
-
if (!player->gui.ee) {
debug(DEBUG_LEVEL_CRITICAL,
"Cannot create Ecore Evas (using %s engine)\n",
player->cfg.evas_engine);
- return 0;
+ return false;
}
ecore_evas_title_set(player->gui.ee, "ePlayer");
@@ -135,7 +132,7 @@
evas_font_path_append(player->gui.evas, DATA_DIR "/fonts");
if (!ui_init_dragger(player))
- return 0;
+ return false;
return ui_init_edje(player, "eplayer");
}
@@ -183,7 +180,7 @@
return stat(eet, &st) ? NULL : eet;
}
-int ui_init_edje(ePlayer *player, const char *name) {
+bool ui_init_edje(ePlayer *player, const char *name) {
double edje_w = 0, edje_h = 0;
debug(DEBUG_LEVEL_INFO, "EDJE: Defining Edje \n");
@@ -196,7 +193,7 @@
name)) {
debug(DEBUG_LEVEL_CRITICAL, "Cannot load theme '%s'!\n",
player->cfg.theme);
- return 0;
+ return false;
}
evas_object_move(player->gui.edje, 0, 0);
@@ -221,7 +218,7 @@
register_callbacks(player);
- return 1;
+ return true;
}
static void register_callbacks(ePlayer *player) {
@@ -363,7 +360,7 @@
return 1;
}
-int ui_refresh_time(ePlayer *player, int time) {
+bool ui_refresh_time(ePlayer *player, int time) {
char buf[9], *fmt[2];
fmt[TIME_DISPLAY_ELAPSED] = "%i:%02i";
@@ -375,15 +372,15 @@
edje_object_part_text_set(player->gui.edje, "time_text", buf);
evas_render(player->gui.evas);
- return 1;
+ return true;
}
-int ui_refresh_seeker(ePlayer *player, double song_pos) {
+bool ui_refresh_seeker(ePlayer *player, double song_pos) {
edje_object_part_drag_value_set(player->gui.edje, "seeker",
song_pos, song_pos);
edje_object_thaw(player->gui.edje);
evas_render(player->gui.evas);
- return 1;
+ return true;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- interface.h 17 Jan 2004 18:18:01 -0000 1.8
+++ interface.h 31 Jan 2004 10:55:25 -0000 1.9
@@ -3,16 +3,16 @@
#include "eplayer.h"
-int ui_init(ePlayer *player);
-int ui_init_edje(ePlayer *player, const char *name);
+bool ui_init(ePlayer *player);
+bool ui_init_edje(ePlayer *player, const char *name);
void ui_deinit();
void ui_fill_track_info(ePlayer *player);
void ui_fill_playlist(ePlayer *player);
int ui_refresh_volume(void *udata);
-int ui_refresh_time(ePlayer *player, int time);
-int ui_refresh_seeker(ePlayer *player, double song_pos);
+bool ui_refresh_time(ePlayer *player, int time);
+bool ui_refresh_seeker(ePlayer *player, double song_pos);
#endif
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
