Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer/src
Modified Files:
callbacks.c eplayer.c interface.c
Log Message:
Added signals PLAYBACK_STARTED and PLAYBACK_STOPPED, as requested by rephorm
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/callbacks.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- callbacks.c 1 Feb 2004 12:03:53 -0000 1.38
+++ callbacks.c 1 Feb 2004 16:58:52 -0000 1.39
@@ -1,5 +1,5 @@
/*
- * $Id: callbacks.c,v 1.38 2004/02/01 12:03:53 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.39 2004/02/01 16:58:52 tsauerbeck Exp $
*/
#include <config.h>
@@ -44,11 +44,11 @@
switch (state) {
case PLAYBACK_STATE_STOPPED:
case PLAYBACK_STATE_PAUSED: /* continue playback */
- res = eplayer_playback_start(player, 0);
+ res = eplayer_playback_start(player, false);
break;
case PLAYBACK_STATE_PLAYING: /* restart from beginning */
eplayer_playback_stop(player);
- res = eplayer_playback_start(player, 1);
+ res = eplayer_playback_start(player, true);
break;
default:
assert(0);
@@ -91,7 +91,7 @@
return;
break;
case PLAYBACK_STATE_PAUSED:
- eplayer_playback_start(player, 0);
+ eplayer_playback_start(player, false);
state = PLAYBACK_STATE_PLAYING;
break;
case PLAYBACK_STATE_PLAYING:
@@ -125,8 +125,8 @@
play = player->cfg.repeat;
if (play) {
- eplayer_playback_start(player, 1);
- state = PLAYBACK_STATE_PLAYING;
+ if (eplayer_playback_start(player, true))
+ state = PLAYBACK_STATE_PLAYING;
} else {
/* refresh track info parts, but don't start playing yet */
track_open(player);
@@ -155,8 +155,8 @@
/* Get the previous list item */
playlist_current_item_prev(player->playlist);
- eplayer_playback_start(player, 1);
- state = PLAYBACK_STATE_PLAYING;
+ if (eplayer_playback_start(player, true))
+ state = PLAYBACK_STATE_PLAYING;
}
EDJE_CB(volume_raise) {
@@ -214,11 +214,9 @@
eplayer_playback_stop(player);
playlist_current_item_set(player->playlist, pli);
- eplayer_playback_start(player, 1);
- state = PLAYBACK_STATE_PLAYING;
-
- /* pass the signal to the main edje */
- edje_object_signal_emit(player->gui.edje, "PLAYLIST_ITEM_PLAY", "ePlayer");
+
+ if (eplayer_playback_start(player, true))
+ state = PLAYBACK_STATE_PLAYING;
}
EDJE_CB(playlist_item_remove) {
@@ -265,8 +263,9 @@
*/
eplayer_playback_stop(player);
pli->plugin->set_current_pos(pli->plugin->get_current_pos() + 5);
- eplayer_playback_start(player, 0);
- state = PLAYBACK_STATE_PLAYING;
+
+ if (eplayer_playback_start(player, false))
+ state = PLAYBACK_STATE_PLAYING;
}
EDJE_CB(seek_backward) {
@@ -278,14 +277,11 @@
eplayer_playback_stop(player);
- if (cur_time < 6) /* restart from the beginning */
- eplayer_playback_start(player, 1);
- else {
+ if (cur_time >= 6)
pli->plugin->set_current_pos(cur_time - 5);
- eplayer_playback_start(player, 0);
- }
-
- state = PLAYBACK_STATE_PLAYING;
+
+ if (eplayer_playback_start(player, cur_time < 6))
+ state = PLAYBACK_STATE_PLAYING;
}
EDJE_CB(seek_forward_start) {
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/eplayer.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- eplayer.c 1 Feb 2004 13:34:11 -0000 1.34
+++ eplayer.c 1 Feb 2004 16:58:53 -0000 1.35
@@ -2,7 +2,7 @@
/* Edje Overhaul startnig phase 4 - Started 7/30/03 */
/*
- * $Id: eplayer.c,v 1.34 2004/02/01 13:34:11 tsauerbeck Exp $
+ * $Id: eplayer.c,v 1.35 2004/02/01 16:58:53 tsauerbeck Exp $
*/
#include <config.h>
@@ -212,6 +212,9 @@
pthread_mutex_unlock(&player->playback_stop_mutex);
pthread_join(player->playback_thread, NULL);
+
+ edje_object_signal_emit(player->gui.edje, "PLAYBACK_STOPPED",
+ "ePlayer");
}
static int check_playback_next(void *udata) {
@@ -257,6 +260,9 @@
pthread_create(&player->playback_thread, NULL,
(void *) &track_play_chunk, player);
+
+ edje_object_signal_emit(player->gui.edje, "PLAYBACK_STARTED",
+ "ePlayer");
return true;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- interface.c 1 Feb 2004 13:12:12 -0000 1.45
+++ interface.c 1 Feb 2004 16:58:53 -0000 1.46
@@ -1,5 +1,5 @@
/*
- * $Id: interface.c,v 1.45 2004/02/01 13:12:12 tsauerbeck Exp $
+ * $Id: interface.c,v 1.46 2004/02/01 16:58:53 tsauerbeck Exp $
*/
#include <config.h>
@@ -168,7 +168,11 @@
debug(DEBUG_LEVEL_INFO, "EDJE: Defining Edje \n");
- player->gui.edje = edje_object_add(player->gui.evas);
+ if (!(player->gui.edje = edje_object_add(player->gui.evas))) {
+ debug(DEBUG_LEVEL_CRITICAL, "Cannot create Edje!\n");
+ return false;
+ }
+
evas_object_name_set(player->gui.edje, "main_edje");
if (!edje_object_file_set(player->gui.edje,
-------------------------------------------------------
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
