Enlightenment CVS committal Author : englebass Project : e17 Module : libs/emotion
Dir : e17/libs/emotion/src/modules/gstreamer Modified Files: emotion_gstreamer.h emotion_gstreamer_pipeline.h Log Message: formatting =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/gstreamer/emotion_gstreamer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- emotion_gstreamer.h 4 Jul 2008 17:56:24 -0000 1.2 +++ emotion_gstreamer.h 6 Jul 2008 09:30:58 -0000 1.3 @@ -1,3 +1,6 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #ifndef __EMOTION_GSTREAMER_H__ #define __EMOTION_GSTREAMER_H__ @@ -17,23 +20,23 @@ struct _Emotion_Video_Sink { - GstElement *sink; - gdouble length_time; - gint width; - gint height; - gint fps_num; - gint fps_den; - guint32 fourcc; + GstElement *sink; + gdouble length_time; + gint width; + gint height; + gint fps_num; + gint fps_den; + guint32 fourcc; }; typedef struct _Emotion_Audio_Sink Emotion_Audio_Sink; struct _Emotion_Audio_Sink { - GstElement *sink; - gdouble length_time; - gint channels; - gint samplerate; + GstElement *sink; + gdouble length_time; + gint channels; + gint samplerate; }; typedef struct _Emotion_Gstreamer_Metadata Emotion_Gstreamer_Metadata; @@ -55,52 +58,52 @@ struct _Emotion_Gstreamer_Video { - /* Gstreamer elements */ - GstElement *pipeline; + /* Gstreamer elements */ + GstElement *pipeline; - /* eos */ - GstBus *eos_bus; - Ecore_Timer *eos_timer; + /* eos */ + GstBus *eos_bus; + Ecore_Timer *eos_timer; - /* Sinks */ - Ecore_List *video_sinks; - Ecore_List *audio_sinks; + /* Sinks */ + Ecore_List *video_sinks; + Ecore_List *audio_sinks; - int video_sink_nbr; - int audio_sink_nbr; + int video_sink_nbr; + int audio_sink_nbr; - /* Evas object */ - Evas_Object *obj; - unsigned char *obj_data; + /* Evas object */ + Evas_Object *obj; + unsigned char *obj_data; - /* Characteristics of stream */ - double position; - double ratio; - double volume; + /* Characteristics of stream */ + double position; + double ratio; + double volume; - volatile int seek_to; - volatile int get_poslen; - volatile double seek_to_pos; + volatile int seek_to; + volatile int get_poslen; + volatile double seek_to_pos; - int fd_ev_read; - int fd_ev_write; - Ecore_Fd_Handler *fd_ev_handler; + int fd_ev_read; + int fd_ev_write; + Ecore_Fd_Handler *fd_ev_handler; - Emotion_Gstreamer_Metadata *metadata; + Emotion_Gstreamer_Metadata *metadata; - Emotion_Vis vis; + Emotion_Vis vis; - unsigned char play : 1; - unsigned char video_mute : 1; - unsigned char audio_mute : 1; + unsigned char play : 1; + unsigned char video_mute : 1; + unsigned char audio_mute : 1; }; unsigned char module_open(Evas_Object *obj, - Emotion_Video_Module **module, - void **video, Emotion_Module_Options *opt); + Emotion_Video_Module **module, + void **video, Emotion_Module_Options *opt); -void module_close (Emotion_Video_Module *module, - void *video); +void module_close(Emotion_Video_Module *module, + void *video); #endif /* __EMOTION_GSTREAMER_H__ */ =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- emotion_gstreamer_pipeline.h 11 May 2008 18:52:29 -0000 1.1 +++ emotion_gstreamer_pipeline.h 6 Jul 2008 09:30:58 -0000 1.2 @@ -1,3 +1,6 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #ifndef __EMOTION_GSTREAMER_PIPELINE_H__ #define __EMOTION_GSTREAMER_PIPELINE_H__ @@ -5,29 +8,29 @@ #include <gst/gst.h> -gboolean emotion_pipeline_pause (GstElement *pipeline); +gboolean emotion_pipeline_pause (GstElement *pipeline); -int emotion_pipeline_cdda_build (void *video, const char * device, unsigned int track); -int emotion_pipeline_file_build (void *video, const char *file); -int emotion_pipeline_uri_build (void *video, const char *uri); -int emotion_pipeline_dvd_build (void *video, const char *device); -int emotion_pipeline_cdda_track_count_get(void *video); - -GstElement *emotion_audio_sink_create (Emotion_Gstreamer_Video *ev, int index); -Emotion_Video_Sink *emotion_video_sink_new (Emotion_Gstreamer_Video *ev); -void emotion_video_sink_free (Emotion_Gstreamer_Video *ev, Emotion_Video_Sink *vsink); +int emotion_pipeline_cdda_build (void *video, const char * device, unsigned int track); +int emotion_pipeline_file_build (void *video, const char *file); +int emotion_pipeline_uri_build (void *video, const char *uri); +int emotion_pipeline_dvd_build (void *video, const char *device); +int emotion_pipeline_cdda_track_count_get (void *video); + +GstElement *emotion_audio_sink_create (Emotion_Gstreamer_Video *ev, int index); +Emotion_Video_Sink *emotion_video_sink_new (Emotion_Gstreamer_Video *ev); +void emotion_video_sink_free (Emotion_Gstreamer_Video *ev, Emotion_Video_Sink *vsink); Emotion_Video_Sink *emotion_visualization_sink_create (Emotion_Gstreamer_Video *ev, Emotion_Audio_Sink *asink); -void emotion_streams_sinks_get (Emotion_Gstreamer_Video *ev, GstElement *decoder); +void emotion_streams_sinks_get (Emotion_Gstreamer_Video *ev, GstElement *decoder); -void emotion_video_sink_fill (Emotion_Video_Sink *vsink, GstPad *pad, GstCaps *caps); +void emotion_video_sink_fill (Emotion_Video_Sink *vsink, GstPad *pad, GstCaps *caps); -void emotion_audio_sink_fill (Emotion_Audio_Sink *asink, GstPad *pad, GstCaps *caps); +void emotion_audio_sink_fill (Emotion_Audio_Sink *asink, GstPad *pad, GstCaps *caps); -void cb_handoff (GstElement *fakesrc, - GstBuffer *buffer, - GstPad *pad, - gpointer user_data); +void cb_handoff (GstElement *fakesrc, + GstBuffer *buffer, + GstPad *pad, + gpointer user_data); void file_new_decoded_pad_cb (GstElement *decodebin, GstPad *new_pad, ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs