From 69825c8e9ad9bd6635bc288a0f324b0ba5aa2fe6 Mon Sep 17 00:00:00 2001 From: Toni Gundogdu Date: Wed, 23 Feb 2011 14:08:14 +0200 Subject: [PATCH] Wrap QUVIPROP_STARTTIME * Bump swig to 2.0.2 * Add start_time test --- Quvi.h | 1 + Quvi.i | 1 + Quvi_wrap.cxx | 98 ++++++++++++++++++++++++++++++++++----------------- Video.cxx | 2 ++ lib/WWW/Quvi.pm | 4 ++- lib/WWW/Quvi.pod | 1 + t/WWW-Quvi-Defaults.t | 13 +++---- 7 files changed, 80 insertions(+), 40 deletions(-) diff --git a/Quvi.h b/Quvi.h index 66d0d48..108774a 100644 --- a/Quvi.h +++ b/Quvi.h @@ -80,6 +80,7 @@ public: std::string id; Link link; bool ok; + std::string start_time; }; class Query diff --git a/Quvi.i b/Quvi.i index bea9301..c09207e 100644 --- a/Quvi.i +++ b/Quvi.i @@ -116,6 +116,7 @@ public: std::string id; Link link; bool ok; + std::string start_time; }; /* Query::_init throws std::runtime_error if quvi_init fails. */ diff --git a/Quvi_wrap.cxx b/Quvi_wrap.cxx index 5a3b2a3..27708ea 100644 --- a/Quvi_wrap.cxx +++ b/Quvi_wrap.cxx @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.1 + * Version 2.0.2 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -1654,6 +1654,12 @@ extern "C" { #ifdef bind #undef bind #endif +#ifdef access +#undef access +#endif +#ifdef stat +#undef stat +#endif @@ -1689,7 +1695,7 @@ static swig_module_info swig_module = {swig_types, 9, 0, 0, 0, 0}; #define SWIG_name "WWW::Quvic::boot_WWW__Quvi" #define SWIG_prefix "WWW::Quvic::" -#define SWIGVERSION 0x020001 +#define SWIGVERSION 0x020002 #define SWIG_VERSION SWIGVERSION @@ -2090,14 +2096,7 @@ SWIG_AsPtr_std_string SWIG_PERL_DECL_ARGS_2(SV * obj, std::string **val) SWIGINTERNINLINE SV * SWIG_From_std_string SWIG_PERL_DECL_ARGS_1(const std::string& s) { - if (s.size()) - { - return SWIG_FromCharPtrAndSize(s.data(), s.size()); - } - else - { - return SWIG_FromCharPtrAndSize(s.c_str(), 0); - } + return SWIG_FromCharPtrAndSize(s.data(), s.size()); } @@ -3299,6 +3298,38 @@ fail: } + XS(_wrap_Video_start_time_get) + { + { + Video *arg1 = (Video *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + std::string *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) + { + SWIG_croak("Usage: Video_start_time_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_Video, 0 | 0 ); + if (!SWIG_IsOK(res1)) + { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Video_start_time_get" "', argument " "1"" of type '" "Video *""'"); + } + arg1 = reinterpret_cast< Video * >(argp1); + result = (std::string *) & ((arg1)->start_time); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(*result)); + argvi++ ; + + XSRETURN(argvi); +fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_delete_Video) { { @@ -3800,6 +3831,7 @@ static swig_command_info swig_commands[] = {"WWW::Quvic::Video_id_get", _wrap_Video_id_get}, {"WWW::Quvic::Video_link_get", _wrap_Video_link_get}, {"WWW::Quvic::Video_ok_get", _wrap_Video_ok_get}, + {"WWW::Quvic::Video_start_time_get", _wrap_Video_start_time_get}, {"WWW::Quvic::delete_Video", _wrap_delete_Video}, {"WWW::Quvic::new_Query", _wrap_new_Query}, {"WWW::Quvic::delete_Query", _wrap_delete_Query}, @@ -4142,14 +4174,14 @@ XS(SWIG_init) SvREADONLY_on(sv); } - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ do + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "libquviVersion", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(libquviVersion))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "libquviVersionLong", TRUE | 0x2 | GV_ADDMULTI); @@ -4157,7 +4189,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ModuleVersion", TRUE | 0x2 | GV_ADDMULTI); @@ -4165,7 +4197,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "OK", TRUE | 0x2 | GV_ADDMULTI); @@ -4173,7 +4205,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Mem", TRUE | 0x2 | GV_ADDMULTI); @@ -4181,7 +4213,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "BadHandle", TRUE | 0x2 | GV_ADDMULTI); @@ -4189,7 +4221,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "InvArg", TRUE | 0x2 | GV_ADDMULTI); @@ -4197,7 +4229,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CurlInit", TRUE | 0x2 | GV_ADDMULTI); @@ -4205,7 +4237,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Last", TRUE | 0x2 | GV_ADDMULTI); @@ -4213,7 +4245,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "AbortedByCallback", TRUE | 0x2 | GV_ADDMULTI); @@ -4221,7 +4253,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "LuaInit", TRUE | 0x2 | GV_ADDMULTI); @@ -4229,7 +4261,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "NoLuaWebsite", TRUE | 0x2 | GV_ADDMULTI); @@ -4237,7 +4269,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "NoLuaUtil", TRUE | 0x2 | GV_ADDMULTI); @@ -4245,7 +4277,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PcreError", TRUE | 0x2 | GV_ADDMULTI); @@ -4253,7 +4285,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "NoSupport", TRUE | 0x2 | GV_ADDMULTI); @@ -4261,7 +4293,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CurlError", TRUE | 0x2 | GV_ADDMULTI); @@ -4269,7 +4301,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IconvError", TRUE | 0x2 | GV_ADDMULTI); @@ -4277,7 +4309,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "LuaError", TRUE | 0x2 | GV_ADDMULTI); @@ -4285,7 +4317,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ProtoHttp", TRUE | 0x2 | GV_ADDMULTI); @@ -4293,7 +4325,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ProtoMms", TRUE | 0x2 | GV_ADDMULTI); @@ -4301,7 +4333,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ProtoRtsp", TRUE | 0x2 | GV_ADDMULTI); @@ -4309,7 +4341,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ProtoRtmp", TRUE | 0x2 | GV_ADDMULTI); @@ -4317,7 +4349,7 @@ XS(SWIG_init) SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/2.0.1/perl5/perltypemaps.swg,65,%set_constant@*/ + /*@SWIG:/usr/share/swig/2.0.2/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ProtoAll", TRUE | 0x2 | GV_ADDMULTI); diff --git a/Video.cxx b/Video.cxx index fb76698..86c20e6 100644 --- a/Video.cxx +++ b/Video.cxx @@ -31,6 +31,7 @@ Video::Video (quvi_video_t qv) :ok (true) _wrap(QUVIPROP_PAGEURL, url, char*); _wrap(QUVIPROP_PAGETITLE, title, char*); _wrap(QUVIPROP_VIDEOID, id, char*); + _wrap(QUVIPROP_STARTTIME, start_time, char*); #undef _wrap link = Link (qv); quvi_parse_close (&qv); @@ -59,6 +60,7 @@ Video::_swap (const Video& v) id = v.id; link = v.link; ok = v.ok; + start_time = v.start_time; } // vim: set ts=2 sw=2 tw=72 expandtab: diff --git a/lib/WWW/Quvi.pm b/lib/WWW/Quvi.pm index e2fd4bf..7df3f70 100644 --- a/lib/WWW/Quvi.pm +++ b/lib/WWW/Quvi.pm @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 2.0.1 +# Version 2.0.2 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. @@ -172,6 +172,8 @@ sub new { *swig_link_set = *WWW::Quvic::Video_link_set; *swig_ok_get = *WWW::Quvic::Video_ok_get; *swig_ok_set = *WWW::Quvic::Video_ok_set; +*swig_start_time_get = *WWW::Quvic::Video_start_time_get; +*swig_start_time_set = *WWW::Quvic::Video_start_time_set; sub DESTROY { return unless $_[0]->isa('HASH'); my $self = tied(%{$_[0]}); diff --git a/lib/WWW/Quvi.pod b/lib/WWW/Quvi.pod index 98ee7b4..e7d6e0e 100644 --- a/lib/WWW/Quvi.pod +++ b/lib/WWW/Quvi.pod @@ -70,6 +70,7 @@ A container hash that holds the parsed video details. $video->{url} $video->{id} $video->{ok} + $video->{start_time} "; =head1 WWW::Quvi::Link diff --git a/t/WWW-Quvi-Defaults.t b/t/WWW-Quvi-Defaults.t index b6a8a4e..f5562af 100644 --- a/t/WWW-Quvi-Defaults.t +++ b/t/WWW-Quvi-Defaults.t @@ -2,7 +2,7 @@ use warnings; use strict; -use Test::More tests => 39; +use Test::More tests => 40; BEGIN { use_ok('WWW::Quvi') }; # Version. @@ -68,11 +68,12 @@ is ($l->{url}, ""); my $v = new WWW::Quvi::Video; isa_ok ($v, 'WWW::Quvi::Video'); -is ($v->{title}, ""); -is ($v->{host}, ""); -is ($v->{url}, ""); -is ($v->{id}, ""); -is ($v->{ok}, ""); +is ($v->{title}, ""); +is ($v->{host}, ""); +is ($v->{url}, ""); +is ($v->{id}, ""); +is ($v->{ok}, ""); +is ($v->{start_time}, ""); # Query. -- 2.11.4.GIT