Commit Graph

172 Commits

Author SHA1 Message Date
Sebastian Dransfeld 84553cfb4a formatting
SVN revision: 35012
2008-07-06 10:05:47 +00:00
Sebastian Dransfeld ec19c6f700 formatting
SVN revision: 35011
2008-07-06 09:52:21 +00:00
Sebastian Dransfeld 10bac60aa1 remove trailing whitespace
SVN revision: 35010
2008-07-06 09:39:08 +00:00
Sebastian Dransfeld a5b61e7746 Add vim header
SVN revision: 35009
2008-07-06 09:32:08 +00:00
Sebastian Dransfeld ac83d5a90b formatting
SVN revision: 35008
2008-07-06 09:31:29 +00:00
Nicolas Aguirre 0d3907acf3 Corrects retrieving metadata for gstreamer module
http://bugs.enlightenment.org/show_bug.cgi?id=504


SVN revision: 35001
2008-07-04 17:56:24 +00:00
Sebastian Dransfeld 2a28ea17b4 Remove unused variables.
SVN revision: 34868
2008-06-19 12:49:11 +00:00
Sebastian Dransfeld f05fe5a8da ignore
SVN revision: 34863
2008-06-19 12:29:22 +00:00
doursse 451451d3e9 remove debug message
SVN revision: 34582
2008-05-15 17:46:13 +00:00
doursse caea856117 * reorganize the way the gstreamer pipeline is built. Fix some usages
of emotion_object_file_set()
 * move the "frame_decode" evas event to _emotion_frame_new() a,d
   replace it in _emotion_video_pos_update() by "position_update"
 * fix a mem leak in the gstreamer backend and in the smart object


SVN revision: 34581
2008-05-15 16:52:04 +00:00
doursse ac834a2726 Don't set sd->video to NULL. sd->video is initialized only when
emotion_object_init() is called. Hence, setting sd->video to NULL
there implied that the code:

emotion_object_init(o, module);
emotion_object_file_set(o, file1);
emotion_object_file_set(o, NULL);
emotion_object_file_set(o, file2);

seg fault.

(such code is useful when you want to reset the same stream
(file1 = file2). The other solution would be to destroy everything
and recreating the pipeline, which is not nice)


SVN revision: 34571
2008-05-14 21:39:33 +00:00
doursse e65023bf1d Contrary to what gstremear's doc says, gst_deinit() does not clean what
gst_init() allocates. Hence, 2 calls of the couple gst_init() / gst_deinit()
fail miserabily. Gstreamer's dev says that the exported function gst_deinit()
should not be called, so let's remove it...


SVN revision: 34560
2008-05-13 20:50:34 +00:00
doursse c014ed5267 put xine and gstreamer modules in their own subdir
SVN revision: 34539
2008-05-11 18:52:29 +00:00
Carsten Haitzler 2ef004009b fix #ifdef
SVN revision: 34065
2008-03-20 21:13:55 +00:00
Gustavo Sverzut Barbieri 46f07234a0 Minor cleanups.
* bitfield must be unsigned;
 * static to most globals;
 * call shutdown on exit.


SVN revision: 33865
2008-02-28 20:35:16 +00:00
doursse 6c22f4068d Fix the play of 2 files. Patch by Nicolas Aguirre
SVN revision: 32576
2007-11-11 16:02:02 +00:00
doursse eb6534508d autostuff improvements:
* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
   and check the required minimal versions.
 * add bzipped distribution archive
 * add AC_LIBTOOL_WIN32_DLL
 * forbid libtool to check fortran and c++ compilers
 * compute libtool versioning from the version of the package
 * pass the directories based on ${prefix} to the preoprocessor
   with the -D option
 * replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
 * remove useless -L flags in *_la_LDFLAGS
 * remove Makefile.in on maintainer-clean rule


SVN revision: 32564
2007-11-11 09:12:08 +00:00
Peter Wehrfritz 4efe3eb21c following the api changes of ecore
SVN revision: 32411
2007-11-06 17:03:43 +00:00
Sebastian Dransfeld b8ee0529f9 Add type identifier.
SVN revision: 32400
2007-11-06 06:56:53 +00:00
doursse 48df189aa7 now you can play several files without segfault
SVN revision: 32299
2007-11-02 11:58:59 +00:00
doursse 4649e92bb8 * Use ecore_plugin instead of dlfcn
* the modules names are now "xine" and "gstreamer" (it's useless to add
   the extension, as ecore_plugin do not need it). I'll fix eclair,
   etk_extra and ewl.
 * look for the modules in path that is pointed by the env variable
    EMOTION_MODULES_DIR first.
 * fix a leak in the gstreamer module
 * remove some trailing spaces


SVN revision: 32261
2007-10-31 19:34:39 +00:00
Carsten Haitzler 8bf6f2f344 fix odd sized videos
SVN revision: 32186
2007-10-28 10:19:09 +00:00
Carsten Haitzler 42ee3df2f6 handle exists too - and it gets written!
SVN revision: 32179
2007-10-28 03:59:23 +00:00
Carsten Haitzler 5482c36015 check if *mod is null
SVN revision: 32167
2007-10-26 10:49:16 +00:00
Brett Nash 8e86740929 Fix two bugs:
- Get pixels from the image object not the smart object
	- Fix typo in if statement


SVN revision: 32157
2007-10-25 04:52:39 +00:00
Carsten Haitzler cf49928045 cedric's ecore_job_init/shtudown patches.
SVN revision: 31972
2007-10-05 05:12:38 +00:00
doursse 6c1843903c * src/modules/emotion_gstreamer.c: (em_file_open):
* src/modules/emotion_gstreamer_pipeline.c: (cb_handoff),
(emotion_pipeline_dvd_build), (emotion_pipeline_uri_build),
(emotion_pipeline_file_build), (_emotion_streams_sinks_get),
(_emotion_video_sink_fill), (_emotion_audio_sink_fill):
* src/modules/emotion_gstreamer_pipeline.h:
add the support of URI playback. Minor fixes.
Fix bug #114


SVN revision: 31592
2007-09-01 17:51:40 +00:00
moom 365936048f * Do not unref twice the same message
SVN revision: 31400
2007-08-19 14:11:38 +00:00
moom 6ad92c53eb * Fix a potential segv with the Gstreamer engine
SVN revision: 31197
2007-08-06 19:17:39 +00:00
Carsten Haitzler 4b435be1ed move a chunk of stuff to use evas_smart_class_new() - evas_smart_new() will
probably die as it's already got legacy funcion methods for layer etc. stuff.


SVN revision: 31161
2007-08-04 13:12:43 +00:00
Peter Wehrfritz cd20fbc9d9 *API BREAK* see the discussion in the mailing list. misc and e_modules will follow
SVN revision: 30970
2007-07-25 17:01:04 +00:00
Carsten Haitzler ade3911a13 work around xine deadlock
SVN revision: 30891
2007-07-18 05:13:19 +00:00
Carsten Haitzler 6f07dd49ee debugging emotion.
SVN revision: 30889
2007-07-18 04:42:31 +00:00
Carsten Haitzler 51080ff853 various patches from the devel mailing list in - and fixed where needed.
SVN revision: 30818
2007-07-15 08:28:11 +00:00
Carsten Haitzler 2432f85b41 link modules to emotion
SVN revision: 29901
2007-05-07 14:04:40 +00:00
Carsten Haitzler dcf1bd85b7 protect if opening still
SVN revision: 29869
2007-05-06 06:40:00 +00:00
Carsten Haitzler 97d7a0526b change to use lazy eval for dlopen
SVN revision: 29868
2007-05-06 05:05:26 +00:00
Carsten Haitzler 826f1c2dcf export api calls to modules
SVN revision: 29867
2007-05-06 05:03:18 +00:00
Carsten Haitzler 6eea59250e use mutex's right with cond's
SVN revision: 28873
2007-03-21 20:20:45 +00:00
Carsten Haitzler d1cd35897d move some more stuff to the threads
SVN revision: 28815
2007-03-19 18:10:21 +00:00
Sebastian Dransfeld 314ec9ce7a Fix compiler warnings.
SVN revision: 28696
2007-03-13 16:23:59 +00:00
Sebastian Dransfeld f7cc0332f5 Fix warnings.
SVN revision: 28695
2007-03-13 16:17:38 +00:00
Christopher Michael bbec1ed7dd Fix recent emotion_gstreamer breakage...someone forgot to update the
function proto & change the module.init call :)


SVN revision: 28692
2007-03-13 11:43:21 +00:00
Carsten Haitzler 2dbc5651d4 move emotion to fix latency on video load, deadlocks on stop/shutdown etc.
SVN revision: 28679
2007-03-13 02:30:14 +00:00
Carsten Haitzler 2026b988bc there is a deadlock between the video out deocder thread and the main process
(emotion) thread as it continues while the main thread is stopped tyring to
stop the video playback - this ends up in a deadlock. this tries to eliminate
that by havng a much more limited framequeue.


SVN revision: 27753
2007-01-03 06:24:25 +00:00
Carsten Haitzler eb21b3503c use the new colorspace support in evas... :)
SVN revision: 27519
2006-12-19 14:15:17 +00:00
Carsten Haitzler 8c93e825a8 same as previous commit.
SVN revision: 26236
2006-09-30 10:18:37 +00:00
sebastid 3641dd1751 EAPI
SVN revision: 25522
2006-09-06 07:17:49 +00:00
doursse 45e3d90729 Fix a freeze when a file is not valid. Add support for DVD (but i works randomly...)
SVN revision: 24034
2006-07-18 19:04:38 +00:00
doursse efd30e948f put the build of the pipelines apart
SVN revision: 23988
2006-07-17 17:11:04 +00:00
doursse 4cea5ab39a use goom and not goom2k4 as default visualization
SVN revision: 23586
2006-06-25 16:52:51 +00:00
doursse 726d47342f volume is between 0 and 1, not 0 and 100
SVN revision: 22817
2006-05-21 18:24:24 +00:00
doursse 2763193cd1 fix audio mute
SVN revision: 22801
2006-05-21 11:13:05 +00:00
doursse 4f02bd7958 fix warnings
SVN revision: 22794
2006-05-21 10:26:09 +00:00
doursse 20b5a8357c fix volume for the gstreamer plugin
SVN revision: 22793
2006-05-21 10:23:15 +00:00
doursse 8357c789a4 add track count in the metadata and fix a bit the _close function. It needs more cara, though
SVN revision: 22618
2006-05-14 14:32:45 +00:00
doursse 8958bf1458 add track count in the metadata
SVN revision: 22617
2006-05-14 14:32:02 +00:00
doursse 41d7b8c78e some cleaning when a file can not be read. Add a function to get the tracks count of a CD
SVN revision: 22473
2006-05-06 13:17:50 +00:00
doursse 1d905fc19b EOS signal. Easier than expected :)
SVN revision: 22293
2006-04-22 10:12:03 +00:00
doursse aa5cf3a34d LOTS of checks added. Fix the seek a bit (gstreamer plugins have problems with seek, btw). It's now possible to mute the video, but it's not the correct fix. Metadata can be grabbed. Beginning of the code for the eos (the way it is done is too close to glib to be done easily)
SVN revision: 22269
2006-04-20 18:23:48 +00:00
doursse 0dae2645a1 fix seeking
SVN revision: 22033
2006-04-11 23:31:03 +00:00
doursse d35d70e863 use autoaudiosink instead of alsasink (for platform != linux). Lots of checks are missing, btw. I need to fix that.
SVN revision: 22021
2006-04-11 12:35:23 +00:00
doursse 0b7568fd83 segfault when cdiocddasrc element is missing fixed. We need it for cd audio.
SVN revision: 21737
2006-04-02 14:36:54 +00:00
doursse 9390e25218 support of cd audio. If n is track you want to play, use as filename : cdda://n. If you want to choose a specific device from your player : cdda:///my/device#n or cdda:///my/device?n. Default device is /dev/cdrom. Also, support of file:///my/file as filename. Thanks to captainigloo
SVN revision: 21736
2006-04-02 13:53:06 +00:00
doursse 10618e769a visualization stuff for emotion_gstreamer. There's a gstreamer bug on the duration of mp3 files (). ogg files are handles correctly
SVN revision: 21217
2006-03-12 09:56:13 +00:00
doursse 67d2c74132 fixes...
SVN revision: 20310
2006-02-06 13:38:08 +00:00
doursse 7ecab55f5b gstreamer 0.10 port. There's a problem with the seek, no evas sink yet
SVN revision: 20273
2006-02-04 13:43:13 +00:00
Carsten Haitzler bef77eed98 link to pthread
SVN revision: 20159
2006-02-01 06:21:52 +00:00
Carsten Haitzler cc8c268dcd less segv's
SVN revision: 19977
2006-01-23 03:00:35 +00:00
Carsten Haitzler 830e68d0ff move plugin to be inlined ans loaded from code and make xine emotion support
work again


SVN revision: 19946
2006-01-21 14:13:51 +00:00
Mike Frysinger aa94c430d3 xine-lib-1.1.1 change member names in the vo_overlay_t struct
SVN revision: 18673
2005-11-28 07:01:43 +00:00
sebastid ce987876a8 Don't use strlen to check for empty string.
SVN revision: 18271
2005-11-04 08:21:28 +00:00
Mike Frysinger 901ef16a1f if ecore lacks both X and FB support, disable the test
SVN revision: 17696
2005-10-20 05:05:52 +00:00
Carsten Haitzler ddae80eeaa suprot testign xr engine
SVN revision: 17134
2005-10-03 13:53:18 +00:00
doursse a5eb691aef remove printf
SVN revision: 17109
2005-10-02 12:19:36 +00:00
doursse bad4d6e848 emotion can use gstreamer, now
SVN revision: 17103
2005-10-02 07:34:36 +00:00
sebastid d80baaa814 Use %f with doubles.
Add string.h for strcmp()
Remove unused variables.


SVN revision: 16580
2005-09-05 16:30:09 +00:00
sebastid 905adad30b Add missing headers.
SVN revision: 16553
2005-09-05 11:05:13 +00:00
sebastid 8903734b6a * Include evas CFLAGS in emotion-config since emotion headers export Evas.h
* Ecore.h isn't needed in exported header


SVN revision: 16526
2005-09-04 18:58:11 +00:00
sebastid e260c571a6 Use AC_PATH_GENERIC
SVN revision: 16492
2005-09-03 19:07:24 +00:00
Carsten Haitzler 42bf60c59a add c++ stuff
SVN revision: 16475
2005-09-03 01:38:45 +00:00
sebastid 8e0218f914 Don't include $(includedir) in searchpath, find headers in this source
and in the provided package CFLAGS.


SVN revision: 16470
2005-09-02 20:15:28 +00:00
sebastid 1f0a680d7f Add return values.
Formatting.
Right macro.


SVN revision: 16438
2005-08-30 23:40:34 +00:00
moom16 ee5135f71f * Have rewritten the yuy2->rgb converter to avoid license problems.
So now, emotion_xine supports yuy2-encoded movies (such as .wmv).


SVN revision: 15678
2005-07-08 23:08:48 +00:00
moom16 8e204f7f56 * Cancel last changes since it seems there are some license problems.
Sorry guys, I didn't think GPLv2 was so "contaminating"


SVN revision: 15677
2005-07-08 20:28:50 +00:00
moom16 8e4e372d87 * Add support of yuy2 to emotion_xine module. So now, we can play wmv
movies!

I had to make some module API changes:
 - rename yuv_size_get to video_data_size_get
 - add the function "Emotion_Format (*format_get) (void *ef);" in Emotion_Video_Module. This function should return the format used by the video (EMOTION_YV12, EMOTION_YUY2 or EMOTION_BGRA).

I use a yuy2->bgra converter since evas doesn't support YUY2. This converter should be rewrite since it's really not optimized and since it is under GPLv2 (emotion is under BSD). I added an explicit comment above the function for that, but it'd be better to use a converter under BSD.
If it's really incompatible with emotion license, I will remove it.


SVN revision: 15675
2005-07-08 19:56:48 +00:00
doursse 08fec2cfb5 indentation
SVN revision: 15418
2005-06-18 05:29:25 +00:00
moom16 cb818ba304 * Emotion now should autodetect the best audio output driver to use
SVN revision: 15390
2005-06-17 17:20:00 +00:00
moom16 ff37c1f9a3 * Should fix the callback "playback_finished" which were sometimes not called.
Thus, the playback won't be stopped anymore sometimes at the end of the playback of a file.


SVN revision: 15236
2005-06-10 17:33:26 +00:00
moom16 87fd2401ea * Should fix the autoplay bug
SVN revision: 14622
2005-05-06 15:35:56 +00:00
Carsten Haitzler 868e54d7d2 use oss - alsa shoudl be doing oss emulation.
SVN revision: 14610
2005-05-05 08:01:52 +00:00
moom16 9eee3ff2ce * We can now initialize the module without having to play a file (we can now initialize the emotion module on the start of the application and so speed up the first play)
SVN revision: 14606
2005-05-04 21:32:37 +00:00
moom16 36a904a439 * add two functions to know if audio and video are handled (emotion_object_audio_handled_get and emotion_object_video_handled_get)
* add a smart callback "audio_level_change" to deal with audio level change
* alsa is now used by default since many people report troubles with oss


SVN revision: 14320
2005-04-24 14:42:50 +00:00
Carsten Haitzler 34c281b1e3 init once!
SVN revision: 14209
2005-04-15 07:36:10 +00:00
Carsten Haitzler 4c2a9d32f9 simon treney's emotion patches - THANKs :o)
SVN revision: 14208
2005-04-15 07:27:02 +00:00
Carsten Haitzler 14ef35f5ca ansi damn u!
SVN revision: 14098
2005-04-05 02:21:06 +00:00
Carsten Haitzler 3f48dd037d moom's patches
SVN revision: 14073
2005-04-02 15:40:35 +00:00
Carsten Haitzler 0ba866f5cf segv waiting to happen
SVN revision: 13923
2005-03-26 15:49:17 +00:00
Carsten Haitzler 4d4065169a .edj
SVN revision: 13868
2005-03-23 03:16:12 +00:00
Carsten Haitzler 5f7a8371ab up to latest xine api! :)
SVN revision: 12923
2005-01-12 11:35:04 +00:00