formatting

SVN revision: 35008
This commit is contained in:
Sebastian Dransfeld 2008-07-06 09:31:29 +00:00
parent 0d3907acf3
commit ac83d5a90b
3 changed files with 390 additions and 360 deletions

View File

@ -1,3 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include <unistd.h>
#include <fcntl.h>
@ -9,11 +12,8 @@
/* Callbacks to get the eos */
static int _eos_timer_fct (void *data);
static int _em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh);
static int _em_fd_ev_active (void *data, Ecore_Fd_Handler *fdh);
static void _for_each_tag (GstTagList const* list, gchar const* tag, void *data);
static void _free_metadata (Emotion_Gstreamer_Metadata *m);
/* Interface */
@ -224,7 +224,6 @@ static Emotion_Video_Module em_module =
em_speed_get, /* speed_get */
em_eject, /* eject */
em_meta_get, /* meta_get */
NULL /* handle */
};
@ -247,15 +246,15 @@ em_init(Evas_Object *obj,
ev->obj_data = NULL;
/* Initialization of gstreamer */
if (!gst_init_check (NULL, NULL, &error))
if (!gst_init_check(NULL, NULL, &error))
goto failure_gstreamer;
/* We allocate the sinks lists */
ev->video_sinks = ecore_list_new ();
ev->video_sinks = ecore_list_new();
if (!ev->video_sinks)
goto failure_video_sinks;
ecore_list_free_cb_set(ev->video_sinks, ECORE_FREE_CB(free));
ev->audio_sinks = ecore_list_new ();
ev->audio_sinks = ecore_list_new();
if (!ev->audio_sinks)
goto failure_audio_sinks;
ecore_list_free_cb_set(ev->audio_sinks, ECORE_FREE_CB(free));
@ -269,15 +268,15 @@ em_init(Evas_Object *obj,
ev->vis = EMOTION_VIS_GOOM;
/* Create the file descriptors */
if (pipe(fds) == 0) {
if (pipe(fds) == 0)
{
ev->fd_ev_read = fds[0];
ev->fd_ev_write = fds[1];
fcntl(ev->fd_ev_read, F_SETFL, O_NONBLOCK);
ev->fd_ev_handler = ecore_main_fd_handler_add(ev->fd_ev_read,
ECORE_FD_READ,
_em_fd_ev_active,
ev,
NULL, NULL);
ev, NULL, NULL);
ecore_main_fd_handler_active_set(ev->fd_ev_handler, ECORE_FD_READ);
}
else
@ -285,13 +284,13 @@ em_init(Evas_Object *obj,
return 1;
failure_pipe:
ecore_list_destroy (ev->audio_sinks);
failure_audio_sinks:
ecore_list_destroy (ev->video_sinks);
failure_video_sinks:
failure_gstreamer:
free (ev);
failure_pipe:
ecore_list_destroy(ev->audio_sinks);
failure_audio_sinks:
ecore_list_destroy(ev->video_sinks);
failure_video_sinks:
failure_gstreamer:
free(ev);
return 0;
}
@ -313,8 +312,8 @@ em_shutdown(void *video)
/* FIXME: and the evas object ? */
if (ev->obj_data) free(ev->obj_data);
ecore_list_destroy (ev->video_sinks);
ecore_list_destroy (ev->audio_sinks);
ecore_list_destroy(ev->video_sinks);
ecore_list_destroy(ev->audio_sinks);
free(ev);
@ -331,11 +330,11 @@ em_file_open(const char *file,
ev = (Emotion_Gstreamer_Video *)video;
ev->pipeline = gst_pipeline_new ("pipeline");
ev->pipeline = gst_pipeline_new("pipeline");
if (!ev->pipeline)
return 0;
ev->eos_bus = gst_pipeline_get_bus (GST_PIPELINE (ev->pipeline));
ev->eos_bus = gst_pipeline_get_bus(GST_PIPELINE(ev->pipeline));
if (!ev->eos_bus)
{
gst_object_unref(ev->pipeline);
@ -346,60 +345,71 @@ em_file_open(const char *file,
ev->obj = obj;
/* CD Audio */
if (strstr (file,"cdda://")) {
if (strstr(file, "cdda://"))
{
const char *device = NULL;
unsigned int track = 1;
device = file + strlen ("cdda://");
if (device[0] == '/') {
device = file + strlen("cdda://");
if (device[0] == '/')
{
char *tmp;
if ((tmp = strchr (device, '?')) || (tmp = strchr (device, '#'))) {
sscanf (tmp + 1,"%d", &track);
if ((tmp = strchr(device, '?')) || (tmp = strchr(device, '#')))
{
sscanf(tmp + 1, "%d", &track);
tmp[0] = '\0';
}
}
else {
else
{
device = NULL;
sscanf (file,"cdda://%d", &track);
sscanf(file, "cdda://%d", &track);
}
fprintf (stderr, "[Emotion] [gst] build CD Audio pipeline\n");
if (!(emotion_pipeline_cdda_build (ev, device, track))) {
fprintf (stderr, "[Emotion] [gst] error while building CD Audio pipeline\n");
fprintf(stderr, "[Emotion] [gst] build CD Audio pipeline\n");
if (!(emotion_pipeline_cdda_build(ev, device, track)))
{
fprintf(stderr, "[Emotion] [gst] error while building CD Audio pipeline\n");
gst_object_unref(ev->pipeline);
return 0;
}
}
/* Dvd */
else if (strstr (file, "dvd://")) {
else if (strstr(file, "dvd://"))
{
fprintf (stderr, "[Emotion] [gst] build DVD pipeline \n");
if (!(emotion_pipeline_dvd_build (ev, NULL))) {
fprintf (stderr, "[Emotion] [gst] error while building DVD pipeline\n");
fprintf(stderr, "[Emotion] [gst] build DVD pipeline\n");
if (!(emotion_pipeline_dvd_build(ev, NULL)))
{
fprintf(stderr, "[Emotion] [gst] error while building DVD pipeline\n");
gst_object_unref(ev->pipeline);
return 0;
}
}
/* http */
else if (strstr (file, "http://")) {
fprintf (stderr, "[Emotion] [gst] build URI pipeline \n");
if (!(emotion_pipeline_uri_build (ev, file))) {
fprintf (stderr, "[Emotion] [gst] error while building URI pipeline\n");
else if (strstr(file, "http://"))
{
fprintf(stderr, "[Emotion] [gst] build URI pipeline\n");
if (!(emotion_pipeline_uri_build(ev, file)))
{
fprintf(stderr, "[Emotion] [gst] error while building URI pipeline\n");
gst_object_unref(ev->pipeline);
return 0;
}
}
/* Normal media file */
else {
else
{
const char *filename;
filename = strstr (file, "file://")
? file + strlen ("file://")
filename = strstr(file, "file://")
? file + strlen("file://")
: file;
fprintf (stderr, "[Emotion] [gst] build file pipeline \n");
if (!(emotion_pipeline_file_build (ev, filename))) {
fprintf (stderr, "[Emotion] [gst] error while building File pipeline\n");
fprintf(stderr, "[Emotion] [gst] build file pipeline\n");
if (!(emotion_pipeline_file_build(ev, filename)))
{
fprintf(stderr, "[Emotion] [gst] error while building File pipeline\n");
gst_object_unref(ev->pipeline);
return 0;
}
@ -412,23 +422,25 @@ em_file_open(const char *file,
Emotion_Video_Sink *vsink;
Emotion_Audio_Sink *asink;
vsink = (Emotion_Video_Sink *)ecore_list_first_goto (ev->video_sinks);
if (vsink) {
fprintf (stderr, "video : \n");
fprintf (stderr, " size : %dx%d\n", vsink->width, vsink->height);
fprintf (stderr, " fps : %d/%d\n", vsink->fps_num, vsink->fps_den);
fprintf (stderr, " fourcc : %" GST_FOURCC_FORMAT "\n", GST_FOURCC_ARGS (vsink->fourcc));
fprintf (stderr, " length : %" GST_TIME_FORMAT "\n\n",
GST_TIME_ARGS ((guint64)(vsink->length_time * GST_SECOND)));
vsink = (Emotion_Video_Sink *)ecore_list_first_goto(ev->video_sinks);
if (vsink)
{
fprintf(stderr, "video : \n");
fprintf(stderr, " size : %dx%d\n", vsink->width, vsink->height);
fprintf(stderr, " fps : %d/%d\n", vsink->fps_num, vsink->fps_den);
fprintf(stderr, " fourcc : %" GST_FOURCC_FORMAT "\n", GST_FOURCC_ARGS(vsink->fourcc));
fprintf(stderr, " length : %" GST_TIME_FORMAT "\n\n",
GST_TIME_ARGS((guint64)(vsink->length_time * GST_SECOND)));
}
asink = (Emotion_Audio_Sink *)ecore_list_first_goto (ev->audio_sinks);
if (asink) {
fprintf (stderr, "audio : \n");
fprintf (stderr, " chan : %d\n", asink->channels);
fprintf (stderr, " rate : %d\n", asink->samplerate);
fprintf (stderr, " length : %" GST_TIME_FORMAT "\n\n",
GST_TIME_ARGS ((guint64)(asink->length_time * GST_SECOND)));
asink = (Emotion_Audio_Sink *)ecore_list_first_goto(ev->audio_sinks);
if (asink)
{
fprintf(stderr, "audio : \n");
fprintf(stderr, " chan : %d\n", asink->channels);
fprintf(stderr, " rate : %d\n", asink->samplerate);
fprintf(stderr, " length : %" GST_TIME_FORMAT "\n\n",
GST_TIME_ARGS((guint64)(asink->length_time * GST_SECOND)));
}
}
@ -451,22 +463,23 @@ em_file_close(void *video)
return;
/* we clear the sink lists */
ecore_list_clear (ev->video_sinks);
ecore_list_clear (ev->audio_sinks);
ecore_list_clear(ev->video_sinks);
ecore_list_clear(ev->audio_sinks);
/* shutdown eos */
if (ev->eos_timer) {
ecore_timer_del (ev->eos_timer);
if (ev->eos_timer)
{
ecore_timer_del(ev->eos_timer);
ev->eos_timer = NULL;
}
if (ev->eos_bus)
{
gst_object_unref (GST_OBJECT (ev->eos_bus));
gst_object_unref(GST_OBJECT(ev->eos_bus));
ev->eos_bus = NULL;
}
if(ev->metadata)
if (ev->metadata)
{
_free_metadata(ev->metadata);
ev->metadata = NULL;
@ -474,7 +487,7 @@ em_file_close(void *video)
if (ev->pipeline)
{
gst_element_set_state (ev->pipeline, GST_STATE_NULL);
gst_element_set_state(ev->pipeline, GST_STATE_NULL);
gst_object_unref(ev->pipeline);
ev->pipeline = NULL;
}
@ -487,11 +500,11 @@ em_play(void *video,
Emotion_Gstreamer_Video *ev;
ev = (Emotion_Gstreamer_Video *)video;
gst_element_set_state (ev->pipeline, GST_STATE_PLAYING);
gst_element_set_state(ev->pipeline, GST_STATE_PLAYING);
ev->play = 1;
/* eos */
ev->eos_timer = ecore_timer_add (0.1, _eos_timer_fct, ev);
ev->eos_timer = ecore_timer_add(0.1, _eos_timer_fct, ev);
}
static void
@ -502,12 +515,13 @@ em_stop(void *video)
ev = (Emotion_Gstreamer_Video *)video;
/* shutdown eos */
if (ev->eos_timer) {
ecore_timer_del (ev->eos_timer);
if (ev->eos_timer)
{
ecore_timer_del(ev->eos_timer);
ev->eos_timer = NULL;
}
gst_element_set_state (ev->pipeline, GST_STATE_PAUSED);
gst_element_set_state(ev->pipeline, GST_STATE_PAUSED);
ev->play = 0;
}
@ -521,12 +535,14 @@ em_size_get(void *video,
ev = (Emotion_Gstreamer_Video *)video;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
if (vsink) {
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink)
{
if (width) *width = vsink->width;
if (height) *height = vsink->height;
}
else {
else
{
if (width) *width = 0;
if (height) *height = 0;
}
@ -544,26 +560,26 @@ em_pos_set(void *video,
if (ev->seek_to_pos == pos) return;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
asink = (Emotion_Audio_Sink *)ecore_list_index_goto (ev->video_sinks, ev->audio_sink_nbr);
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
asink = (Emotion_Audio_Sink *)ecore_list_index_goto(ev->video_sinks, ev->audio_sink_nbr);
if (vsink) {
if (vsink)
{
gst_element_seek(vsink->sink, 1.0,
GST_FORMAT_TIME,
GST_SEEK_FLAG_ACCURATE | GST_SEEK_FLAG_FLUSH,
GST_SEEK_TYPE_SET,
(gint64)(pos * (double)GST_SECOND),
GST_SEEK_TYPE_NONE,
-1);
GST_SEEK_TYPE_NONE, -1);
}
if (asink) {
if (asink)
{
gst_element_seek(asink->sink, 1.0,
GST_FORMAT_TIME,
GST_SEEK_FLAG_ACCURATE | GST_SEEK_FLAG_FLUSH,
GST_SEEK_TYPE_SET,
(gint64)(pos * (double)GST_SECOND),
GST_SEEK_TYPE_NONE,
-1);
GST_SEEK_TYPE_NONE, -1);
}
ev->seek_to_pos = pos;
}
@ -588,7 +604,7 @@ em_len_get(void *video)
ev = (Emotion_Gstreamer_Video *)video;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink)
return (double)vsink->length_time;
@ -603,7 +619,7 @@ em_fps_num_get(void *video)
ev = (Emotion_Gstreamer_Video *)video;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink)
return vsink->fps_num;
@ -618,7 +634,7 @@ em_fps_den_get(void *video)
ev = (Emotion_Gstreamer_Video *)video;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink)
return vsink->fps_den;
@ -633,7 +649,7 @@ em_fps_get(void *video)
ev = (Emotion_Gstreamer_Video *)video;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink)
return (double)vsink->fps_num / (double)vsink->fps_den;
@ -677,7 +693,7 @@ em_video_handled(void *video)
ev = (Emotion_Gstreamer_Video *)video;
if (ecore_list_empty_is (ev->video_sinks))
if (ecore_list_empty_is(ev->video_sinks))
return 0;
return 1;
@ -690,7 +706,7 @@ em_audio_handled(void *video)
ev = (Emotion_Gstreamer_Video *)video;
if (ecore_list_empty_is (ev->audio_sinks))
if (ecore_list_empty_is(ev->audio_sinks))
return 0;
return 1;
@ -715,23 +731,25 @@ em_frame_done(void *video)
}
static Emotion_Format
em_format_get (void *video)
em_format_get(void *video)
{
Emotion_Gstreamer_Video *ev;
Emotion_Video_Sink *vsink;
ev = (Emotion_Gstreamer_Video *)video;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
if (vsink) {
switch (vsink->fourcc) {
case GST_MAKE_FOURCC ('I','4','2','0'):
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink)
{
switch (vsink->fourcc)
{
case GST_MAKE_FOURCC('I', '4', '2', '0'):
return EMOTION_FORMAT_I420;
case GST_MAKE_FOURCC ('Y','V','1','2'):
case GST_MAKE_FOURCC('Y', 'V', '1', '2'):
return EMOTION_FORMAT_YV12;
case GST_MAKE_FOURCC ('Y','U','Y','2'):
case GST_MAKE_FOURCC('Y', 'U', 'Y', '2'):
return EMOTION_FORMAT_YUY2;
case GST_MAKE_FOURCC ('A','R','G','B'):
case GST_MAKE_FOURCC('A', 'R', 'G', 'B'):
return EMOTION_FORMAT_BGRA;
default:
return EMOTION_FORMAT_NONE;
@ -748,12 +766,14 @@ em_video_data_size_get(void *video, int *w, int *h)
ev = (Emotion_Gstreamer_Video *)video;
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
if (vsink) {
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink)
{
*w = vsink->width;
*h = vsink->height;
}
else {
else
{
*w = 0;
*h = 0;
}
@ -774,22 +794,24 @@ em_yuv_rows_get(void *video,
if (ev->obj_data)
{
if (em_format_get(video) == EMOTION_FORMAT_I420) {
if (em_format_get(video) == EMOTION_FORMAT_I420)
{
for (i = 0; i < h; i++)
yrows[i] = &ev->obj_data[i * w];
for (i = 0; i < (h / 2); i++)
urows[i] = &ev->obj_data[h * w + i * (w / 2) ];
urows[i] = &ev->obj_data[h * w + i * (w / 2)];
for (i = 0; i < (h / 2); i++)
vrows[i] = &ev->obj_data[h * w + h * (w /4) + i * (w / 2)];
}
else if (em_format_get(video) == EMOTION_FORMAT_YV12) {
else if (em_format_get(video) == EMOTION_FORMAT_YV12)
{
for (i = 0; i < h; i++)
yrows[i] = &ev->obj_data[i * w];
for (i = 0; i < (h / 2); i++)
vrows[i] = &ev->obj_data[h * w + i * (w / 2) ];
vrows[i] = &ev->obj_data[h * w + i * (w / 2)];
for (i = 0; i < (h / 2); i++)
urows[i] = &ev->obj_data[h * w + h * (w /4) + i * (w / 2)];
@ -810,7 +832,8 @@ em_bgra_data_get(void *video, unsigned char **bgra_data)
ev = (Emotion_Gstreamer_Video *)video;
if (ev->obj_data && em_format_get(video) == EMOTION_FORMAT_BGRA) {
if (ev->obj_data && em_format_get(video) == EMOTION_FORMAT_BGRA)
{
*bgra_data = ev->obj_data;
return 1;
}
@ -964,15 +987,15 @@ em_audio_channel_mute_set(void *video,
return;
ev->audio_mute = mute;
volume = gst_bin_get_by_name (GST_BIN (ev->pipeline), "volume");
volume = gst_bin_get_by_name(GST_BIN(ev->pipeline), "volume");
if (!volume) return;
if (mute)
g_object_set (G_OBJECT (volume), "volume", 0.0, NULL);
g_object_set(G_OBJECT(volume), "volume", 0.0, NULL);
else
g_object_set (G_OBJECT (volume), "volume", ev->volume * 10.0, NULL);
g_object_set(G_OBJECT(volume), "volume", ev->volume * 10.0, NULL);
gst_object_unref (volume);
gst_object_unref(volume);
}
static int
@ -999,11 +1022,11 @@ em_audio_channel_volume_set(void *video,
if (vol > 1.0)
vol = 1.0;
ev->volume = vol;
volume = gst_bin_get_by_name (GST_BIN (ev->pipeline), "volume");
volume = gst_bin_get_by_name(GST_BIN(ev->pipeline), "volume");
if (!volume) return;
g_object_set (G_OBJECT (volume), "volume",
g_object_set(G_OBJECT(volume), "volume",
vol * 10.0, NULL);
gst_object_unref (volume);
gst_object_unref(volume);
}
static double
@ -1130,8 +1153,6 @@ em_speed_get(void *video)
static int
em_eject(void *video)
{
Emotion_Gstreamer_Video *ev;
@ -1203,7 +1224,7 @@ module_close(Emotion_Video_Module *module,
}
static void
_for_each_tag (GstTagList const* list,
_for_each_tag(GstTagList const* list,
gchar const* tag,
void *data)
{
@ -1217,83 +1238,83 @@ _for_each_tag (GstTagList const* list,
if (!ev || !ev->metadata) return;
count = gst_tag_list_get_tag_size (list, tag);
val = gst_tag_list_get_value_index (list, tag, 0);
count = gst_tag_list_get_tag_size(list, tag);
val = gst_tag_list_get_value_index(list, tag, 0);
for ( i = 0; i < count; ++i)
for (i = 0; i < count; i++)
{
if (!strcmp (tag, GST_TAG_TITLE))
if (!strcmp(tag, GST_TAG_TITLE))
{
char *str;
if (ev->metadata->title) g_free(ev->metadata->title);
if (gst_tag_list_get_string (list, GST_TAG_TITLE, &str))
if (gst_tag_list_get_string(list, GST_TAG_TITLE, &str))
ev->metadata->title = str;
else
ev->metadata->title = NULL;
break;
}
if (!strcmp (tag, GST_TAG_ALBUM))
if (!strcmp(tag, GST_TAG_ALBUM))
{
gchar *str;
if (ev->metadata->album) g_free(ev->metadata->album);
if (gst_tag_list_get_string (list, GST_TAG_ALBUM, &str))
if (gst_tag_list_get_string(list, GST_TAG_ALBUM, &str))
ev->metadata->album = str;
else
ev->metadata->album = NULL;
break;
}
if (!strcmp (tag, GST_TAG_ARTIST))
if (!strcmp(tag, GST_TAG_ARTIST))
{
gchar *str;
if (ev->metadata->artist) g_free( ev->metadata->artist);
if (gst_tag_list_get_string (list, GST_TAG_ARTIST, &str))
if (gst_tag_list_get_string(list, GST_TAG_ARTIST, &str))
ev->metadata->artist = str;
else
ev->metadata->artist = NULL;
break;
}
if (!strcmp (tag, GST_TAG_GENRE))
if (!strcmp(tag, GST_TAG_GENRE))
{
gchar *str;
if (ev->metadata->genre) g_free( ev->metadata->genre);
if (gst_tag_list_get_string (list, GST_TAG_GENRE, &str))
if (gst_tag_list_get_string(list, GST_TAG_GENRE, &str))
ev->metadata->genre = str;
else
ev->metadata->genre = NULL;
break;
}
if (!strcmp (tag, GST_TAG_COMMENT))
if (!strcmp(tag, GST_TAG_COMMENT))
{
gchar *str;
if (ev->metadata->comment) g_free(ev->metadata->comment);
if (gst_tag_list_get_string (list, GST_TAG_COMMENT, &str))
if (gst_tag_list_get_string(list, GST_TAG_COMMENT, &str))
ev->metadata->comment = str;
else
ev->metadata->comment = NULL;
break;
}
if (!strcmp (tag, GST_TAG_DATE))
if (!strcmp(tag, GST_TAG_DATE))
{
gchar *str;
const GValue *date;
if (ev->metadata->year) g_free(ev->metadata->year);
date = gst_tag_list_get_value_index (list, GST_TAG_DATE, 0);
date = gst_tag_list_get_value_index(list, GST_TAG_DATE, 0);
if (date)
str = g_strdup_value_contents (date);
str = g_strdup_value_contents(date);
else
str = NULL;
ev->metadata->year = str;
break;
}
if (!strcmp (tag, GST_TAG_TRACK_NUMBER))
if (!strcmp(tag, GST_TAG_TRACK_NUMBER))
{
gchar *str;
const GValue *track;
if (ev->metadata->count) g_free( ev->metadata->count);
track = gst_tag_list_get_value_index (list, GST_TAG_TRACK_NUMBER, 0);
track = gst_tag_list_get_value_index(list, GST_TAG_TRACK_NUMBER, 0);
if (track)
str = g_strdup_value_contents (track);
str = g_strdup_value_contents(track);
else
str = NULL;
ev->metadata->count = str;
@ -1301,14 +1322,14 @@ _for_each_tag (GstTagList const* list,
}
#ifdef GST_TAG_CDDA_CDDB_DISCID
if (!strcmp (tag, GST_TAG_CDDA_CDDB_DISCID))
if (!strcmp(tag, GST_TAG_CDDA_CDDB_DISCID))
{
gchar *str;
const GValue *discid;
if (ev->metadata->disc_id) g_free(ev->metadata->disc_id);
discid = gst_tag_list_get_value_index (list, GST_TAG_CDDA_CDDB_DISCID, 0);
discid = gst_tag_list_get_value_index(list, GST_TAG_CDDA_CDDB_DISCID, 0);
if (discid)
str = g_strdup_value_contents (discid);
str = g_strdup_value_contents(discid);
else
str = NULL;
ev->metadata->disc_id = str;
@ -1320,7 +1341,7 @@ _for_each_tag (GstTagList const* list,
}
static void
_free_metadata (Emotion_Gstreamer_Metadata *m)
_free_metadata(Emotion_Gstreamer_Metadata *m)
{
if (!m) return;
@ -1334,7 +1355,6 @@ _free_metadata (Emotion_Gstreamer_Metadata *m)
if (m->disc_id) g_free(m->disc_id);
free(m);
}
static int
@ -1359,30 +1379,34 @@ _em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh)
frame_data = buf[0];
buffer = buf[1];
_emotion_frame_new(ev->obj);
vsink = (Emotion_Video_Sink *)ecore_list_index_goto (ev->video_sinks, ev->video_sink_nbr);
vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
if (vsink) _emotion_video_pos_update(ev->obj, ev->position, vsink->length_time);
}
}
return 1;
}
int _eos_timer_fct (void *data)
static int
_eos_timer_fct(void *data)
{
Emotion_Gstreamer_Video *ev;
GstMessage *msg;
ev = (Emotion_Gstreamer_Video *)data;
while ((msg = gst_bus_poll (ev->eos_bus, GST_MESSAGE_ERROR | GST_MESSAGE_EOS | GST_MESSAGE_TAG, 0))) {
switch (GST_MESSAGE_TYPE(msg)) {
case GST_MESSAGE_ERROR: {
while ((msg = gst_bus_poll(ev->eos_bus, GST_MESSAGE_ERROR | GST_MESSAGE_EOS | GST_MESSAGE_TAG, 0)))
{
switch (GST_MESSAGE_TYPE(msg))
{
case GST_MESSAGE_ERROR:
{
gchar *debug;
GError *err;
gst_message_parse_error (msg, &err, &debug);
g_free (debug);
gst_message_parse_error(msg, &err, &debug);
g_free(debug);
g_print ("Error: %s\n", err->message);
g_error_free (err);
g_print("Error: %s\n", err->message);
g_error_free(err);
break;
}
@ -1399,18 +1423,18 @@ int _eos_timer_fct (void *data)
case GST_MESSAGE_TAG:
{
GstTagList *new_tags;
gst_message_parse_tag (msg, &new_tags);
gst_message_parse_tag(msg, &new_tags);
if (new_tags)
{
gst_tag_list_foreach (new_tags, (GstTagForeachFunc)_for_each_tag, ev);
gst_tag_list_free (new_tags);
gst_tag_list_foreach(new_tags, (GstTagForeachFunc)_for_each_tag, ev);
gst_tag_list_free(new_tags);
}
break;
}
default:
break;
}
gst_message_unref (msg);
gst_message_unref(msg);
}
return 1;
}

View File

@ -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__
@ -99,7 +102,7 @@ unsigned char module_open(Evas_Object *obj,
Emotion_Video_Module **module,
void **video, Emotion_Module_Options *opt);
void module_close (Emotion_Video_Module *module,
void module_close(Emotion_Video_Module *module,
void *video);

View File

@ -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__
@ -11,7 +14,7 @@ int emotion_pipeline_cdda_build (void *video, const char * device, unsigned int
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);
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);