Enlightenment CVS committal
Author : mickeyl
Project : e17
Module : proto/eflpp
Dir : e17/proto/eflpp/src/emotion
Modified Files:
eflpp_emotion.cpp eflpp_emotion.h
Log Message:
eflpp: catch up w/ emotion. patch by Jan Stoefer, thanks!
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/emotion/eflpp_emotion.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eflpp_emotion.cpp 14 Aug 2007 20:58:03 -0000 1.2
+++ eflpp_emotion.cpp 23 Jul 2008 19:13:14 -0000 1.3
@@ -14,46 +14,56 @@
// EvasEmotion
//===============================================================================================
-EvasEmotion::EvasEmotion( EvasCanvas* canvas, const char* name )
+EvasEmotion::EvasEmotion( const char * module_filename, EvasCanvas* canvas,
const char* name )
:EvasObject( canvas )
{
o = emotion_object_add( canvas->obj() );
init( name ? name : "emotion" );
+ engineInit(module_filename);
}
-EvasEmotion::EvasEmotion( const char* filename, EvasCanvas* canvas, const
char* name )
- :EvasObject( canvas )
+EvasEmotion::EvasEmotion( const char* filename, const char * module_filename,
+ EvasCanvas* canvas, const
char* name ) :EvasObject( canvas )
{
o = emotion_object_add( canvas->obj() );
init( name ? name : filename );
-
+ engineInit(module_filename);
setFile( filename );
}
-EvasEmotion::EvasEmotion( int x, int y, const char* filename, EvasCanvas*
canvas, const char* name )
+EvasEmotion::EvasEmotion( int x, int y, const char* filename, const char *
module_filename,
+ EvasCanvas* canvas, const
char* name )
:EvasObject( canvas )
{
o = emotion_object_add( canvas->obj() );
init( name ? name : filename );
-
+ engineInit(module_filename);
setFile( filename );
move( x, y );
}
-EvasEmotion::EvasEmotion( int x, int y, int width, int height, const char*
filename, EvasCanvas* canvas, const char* name )
+EvasEmotion::EvasEmotion( int x, int y, int width, int height, const char*
filename,
+ const char * module_filename,
EvasCanvas* canvas, const char* name )
:EvasObject( canvas )
{
- o = emotion_object_add( canvas->obj() );
+ printf("EvasEmotion::EvasEmotion, begin \n");
+ o = emotion_object_add( canvas->obj() );
+
init( name ? name : filename );
-
+ engineInit(module_filename);
setFile( filename );
move( x, y );
resize( width, height );
}
+void EvasEmotion::engineInit (const char * module_filename) {
+ if (!emotion_object_init(o, module_filename))
+ return;
+}
+
void EvasEmotion::setFile( const char* filename )
{
- emotion_object_file_set( o, filename );
+ emotion_object_file_set( o, filename );
}
void EvasEmotion::setPlay( bool b )
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/emotion/eflpp_emotion.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eflpp_emotion.h 3 Jul 2007 22:42:36 -0000 1.1
+++ eflpp_emotion.h 23 Jul 2008 19:13:14 -0000 1.2
@@ -24,13 +24,21 @@
class EvasEmotion : public EvasObject
{
public:
- EvasEmotion( EvasCanvas* canvas, const char* name = 0 );
- EvasEmotion( const char* filename, EvasCanvas* canvas, const char* name =
0 );
- EvasEmotion( int x, int y, const char* filename, EvasCanvas* canvas, const
char* name = 0 );
- EvasEmotion( int x, int y, int width, int height, const char* filename,
EvasCanvas* canvas, const char* name = 0 );
+ EvasEmotion( const char * module_filename, EvasCanvas* canvas, const char*
name = 0 );
+ EvasEmotion( const char* filename, const char * module_filename,
EvasCanvas* canvas, const char* name = 0 );
+ EvasEmotion( int x, int y, const char* filename, const char *
module_filename, EvasCanvas* canvas, const char* name = 0 );
+ EvasEmotion( int x, int y, int width, int height, const char* filename,
+ const char * module_filename, EvasCanvas*
canvas, const char* name = 0 );
//EvasEmotion( Evas_Object* object, EvasCanvas* canvas, const char* name =
0 );
~EvasEmotion();
-
+
+ /**
+ * Initialize video engine to either use xine or gstreamer
+ *
+ * @param module_filename name of viedo engine to be used
+ */
+ void engineInit(const char * module_filename);
+
void setFile( const char* filename );
void setPlay( bool b );
void setSmoothScale( bool b );
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
