It makes no sense to keep _file_set() and abuse file parameter as uri to give remote pointers... Why raster requested it ?
Why not keep only uri_set? On Tuesday, February 21, 2012, Enlightenment SVN wrote: > Log: > Deprecate elm_video_uri_set(). > > Signed-off-by: Sanjeev BA <[email protected] <javascript:;>> > > Author: sanjeev > Date: 2012-02-20 21:52:55 -0800 (Mon, 20 Feb 2012) > New Revision: 68200 > Trac: http://trac.enlightenment.org/e/changeset/68200 > > Modified: > trunk/elementary/src/edje_externals/elm_video.c > trunk/elementary/src/lib/elm_deprecated.h > trunk/elementary/src/lib/elm_video.c trunk/elementary/src/lib/elm_video.h > > Modified: trunk/elementary/src/edje_externals/elm_video.c > =================================================================== > --- trunk/elementary/src/edje_externals/elm_video.c 2012-02-21 > 04:42:45 UTC (rev 68199) > +++ trunk/elementary/src/edje_externals/elm_video.c 2012-02-21 > 05:52:55 UTC (rev 68200) > @@ -31,7 +31,7 @@ > else return; > > if (p->file) elm_video_file_set(obj, p->file); > - if (p->uri) elm_video_uri_set(obj, p->uri); > + if (p->uri) elm_video_file_set(obj, p->uri); > if (p->play_exists && p->play) elm_video_play(obj); > if (p->pause_exists && p->pause) elm_video_pause(obj); > if (p->stop_exists && p->stop) elm_video_stop(obj); > @@ -55,7 +55,7 @@ > else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) > && (!strcmp(param->name, "uri"))) > { > - elm_video_uri_set(obj, param->s); > + elm_video_file_set(obj, param->s); > return EINA_TRUE; > } > else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) > > Modified: trunk/elementary/src/lib/elm_deprecated.h > =================================================================== > --- trunk/elementary/src/lib/elm_deprecated.h 2012-02-21 04:42:45 UTC > (rev 68199) > +++ trunk/elementary/src/lib/elm_deprecated.h 2012-02-21 05:52:55 UTC > (rev 68200) > @@ -4490,6 +4490,23 @@ > */ > EINA_DEPRECATED EAPI void elm_all_flush(void); > > + > /** > + * @brief Define the uri that will be the video source. > + * > + * @param video The video object to define the file for. > + * @param uri The uri to target. > + * > + * This function will define an uri as a source for the video of the > + * Elm_Video object. URI could be remote source of video, like http://or > local > + * like for example WebCam who are most of the time v4l2:// (but that > depend an > + * you should use Emotion API to request and list the available Webcam on > your > + * > + * @deprecated Use elm_video_file_set() instead. > + * > + */ > +EINA_DEPRECATED EAPI void elm_video_uri_set(Evas_Object > *video, const char *uri); > + > +/** > * @} > */ > > Modified: trunk/elementary/src/lib/elm_video.c > =================================================================== > --- trunk/elementary/src/lib/elm_video.c 2012-02-21 04:42:45 UTC > (rev 68199) > +++ trunk/elementary/src/lib/elm_video.c 2012-02-21 05:52:55 UTC > (rev 68200) > @@ -320,7 +320,10 @@ > if (wd->remember) emotion_object_last_position_save(wd->emotion); > wd->stop = EINA_FALSE; > emotion_object_file_set(wd->emotion, filename); > - emotion_object_last_position_load(wd->emotion); > + > + if ((!strncmp(filename, "file://", 7)) || (!strstr(filename, "://"))) > + emotion_object_last_position_load(wd->emotion); > + > edje_object_signal_emit(wd->layout, "elm,video,load", "elm"); > #else > (void) video; > @@ -328,7 +331,7 @@ > #endif > } > > -EAPI void > +EINA_DEPRECATED EAPI void > elm_video_uri_set(Evas_Object *video, const char *uri) > { > #ifdef HAVE_EMOTION > > Modified: trunk/elementary/src/lib/elm_video.h > =================================================================== > --- trunk/elementary/src/lib/elm_video.h 2012-02-21 04:42:45 UTC > (rev 68199) > +++ trunk/elementary/src/lib/elm_video.h 2012-02-21 05:52:55 UTC > (rev 68200) > @@ -58,22 +58,26 @@ > * This function inserts a new video widget on the canvas. > * > * @see elm_video_file_set() > - * @see elm_video_uri_set() > * > * @ingroup Video > */ > EAPI Evas_Object *elm_video_add(Evas_Object *parent); > > /** > - * @brief Define the file that will be the video source. > + * @brief Define the file or URI that will be the video source. > * > - * @param video The video object to define the file for. > - * @param filename The file to target. > + * @param video The video object to define the file or URI for the video > + * of the Elm_Video object. > * > - * This function will explicitly define a filename as a source > + * @param filename The file or URI to target. > + * Local files can be specified using file:// or by using full file paths. > + * URI could be remote source of video, like http:// or local source like > + * WebCam (v4l2://). (You can use Emotion API to request and list > + * the available Webcam on your system). > + * > + * This function will explicitly define a file or URI as a source > * for the video of the Elm_Video object. > * > - * @see elm_video_uri_set() > * @see elm_video_add() > * @see elm_player_add() > * > @@ -82,26 +86,6 @@ > EAPI void elm_video_file_set(Evas_Object *video, const > char *filename); > > /** > - * @brief Define the uri that will be the video source. > - * > - * @param video The video object to define the file for. > - * @param uri The uri to target. > - * > - * This function will define an uri as a source for the video of the > - * Elm_Video object. URI could be remote source of video, like http://or > local source > - * like for example WebCam who are most of the time v4l2:// (but that > depend and > - * you should use Emotion API to request and list the available Webcam on > your system). > - * > - * @see elm_video_file_set() > - * @see elm_video_add() > - * @see elm_player_add() > - * > - * @ingroup Video > - */ > -/* XXX: remove this - just keep elm_video_file_set() */ > -EAPI void elm_video_uri_set(Evas_Object *video, const > char *uri); > - > -/** > * @brief Get the underlying Emotion object. > * > * @param video The video object to proceed the request on. > > > > ------------------------------------------------------------------------------ > Keep Your Developer Skills Current with LearnDevNow! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-d2d > _______________________________________________ > enlightenment-svn mailing list > [email protected] <javascript:;> > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > -- Gustavo Sverzut Barbieri http://profusion.mobi embedded systems -------------------------------------- MSN: [email protected] Skype: gsbarbieri Mobile: +55 (19) 9225-2202 ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
