Skip to content

Commit

Permalink
Merge pull request xbmc#2494 from smfontes/pictureinfo
Browse files Browse the repository at this point in the history 
Make picture tags complete and consistent
  • Loading branch information
@jmarshallnz
jmarshallnz committed Apr 8, 2013
2 parents 33a0d63 + f33e42e commit 1e21f00
Show file tree
Hide file tree
Showing 8 changed files with 240 additions and 92 deletions.
16 changes: 14 additions & 2 deletions language/English/strings.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10131,7 +10131,19 @@ msgctxt "#21843"
msgid "Orientation"
msgstr ""

#empty strings from id 21844 to 21859
#empty strings from id 21844 to 21856

msgctxt "#21857"
msgid "Sub-location"
msgstr ""

msgctxt "#21858"
msgid "Image type"
msgstr ""

msgctxt "#21859"
msgid "Time created"
msgstr ""

msgctxt "#21860"
msgid "Supplemental categories"
Expand Down Expand Up @@ -10206,7 +10218,7 @@ msgid "Date created"
msgstr ""

msgctxt "#21878"
msgid "Copyright flag"
msgid "Urgency"
msgstr ""

msgctxt "#21879"
Expand Down
4 changes: 2 additions & 2 deletions lib/libexif/IptcParse.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#define IPTC_COUNTRY 0x65
#define IPTC_TRANSMISSION_REFERENCE 0x67
#define IPTC_DATE 0x37
#define IPTC_COPYRIGHT 0x0A
#define IPTC_URGENCY 0x0A
#define IPTC_COUNTRY_CODE 0x64
#define IPTC_REFERENCE_SERVICE 0x2D
#define IPTC_TIME_CREATED 0x3C
Expand Down Expand Up @@ -177,7 +177,7 @@ bool CIptcParse::Process (const unsigned char* const Data, const unsigned short
case IPTC_COUNTRY: tag = info->Country; break;
case IPTC_TRANSMISSION_REFERENCE: tag = info->TransmissionReference; break;
case IPTC_DATE: tag = info->Date; break;
case IPTC_COPYRIGHT: tag = info->Copyright; break;
case IPTC_URGENCY: tag = info->Urgency; break;
case IPTC_REFERENCE_SERVICE: tag = info->ReferenceService; break;
case IPTC_COUNTRY_CODE: tag = info->CountryCode; break;
case IPTC_TIME_CREATED: tag = info->TimeCreated; break;
Expand Down
2 changes: 1 addition & 1 deletion lib/libexif/libexif.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ typedef struct {
char Country[MAX_IPTC_STRING];
char TransmissionReference[MAX_IPTC_STRING];
char Date[MAX_IPTC_STRING];
char Copyright[MAX_IPTC_STRING];
char Urgency[MAX_IPTC_STRING];
char ReferenceService[MAX_IPTC_STRING];
char CountryCode[MAX_IPTC_STRING];
char TimeCreated[MAX_IPTC_STRING];
Expand Down
71 changes: 71 additions & 0 deletions xbmc/GUIInfoManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,9 @@ const infomap listitem_labels[]= {{ "thumb", LISTITEM_THUMB },
{ "picturepath", LISTITEM_PICTURE_PATH },
{ "pictureresolution",LISTITEM_PICTURE_RESOLUTION },
{ "picturedatetime", LISTITEM_PICTURE_DATETIME },
{ "picturedate", LISTITEM_PICTURE_DATE },
{ "picturelongdatetime",LISTITEM_PICTURE_LONGDATETIME },
{ "picturelongdate", LISTITEM_PICTURE_LONGDATE },
{ "picturecomment", LISTITEM_PICTURE_COMMENT },
{ "picturecaption", LISTITEM_PICTURE_CAPTION },
{ "picturedesc", LISTITEM_PICTURE_DESC },
Expand All @@ -479,6 +482,39 @@ const infomap listitem_labels[]= {{ "thumb", LISTITEM_THUMB },
{ "pictureexpmode", LISTITEM_PICTURE_EXP_MODE },
{ "pictureexptime", LISTITEM_PICTURE_EXP_TIME },
{ "pictureiso", LISTITEM_PICTURE_ISO },
{ "pictureauthor", LISTITEM_PICTURE_AUTHOR },
{ "picturebyline", LISTITEM_PICTURE_BYLINE },
{ "picturebylinetitle", LISTITEM_PICTURE_BYLINE_TITLE },
{ "picturecategory", LISTITEM_PICTURE_CATEGORY },
{ "pictureccdwidth", LISTITEM_PICTURE_CCD_WIDTH },
{ "picturecity", LISTITEM_PICTURE_CITY },
{ "pictureurgency", LISTITEM_PICTURE_URGENCY },
{ "picturecopyrightnotice", LISTITEM_PICTURE_COPYRIGHT_NOTICE },
{ "picturecountry", LISTITEM_PICTURE_COUNTRY },
{ "picturecountrycode", LISTITEM_PICTURE_COUNTRY_CODE },
{ "picturecredit", LISTITEM_PICTURE_CREDIT },
{ "pictureiptcdate", LISTITEM_PICTURE_IPTCDATE },
{ "picturedigitalzoom", LISTITEM_PICTURE_DIGITAL_ZOOM },
{ "pictureexposure", LISTITEM_PICTURE_EXPOSURE },
{ "pictureexposurebias", LISTITEM_PICTURE_EXPOSURE_BIAS },
{ "pictureflashused", LISTITEM_PICTURE_FLASH_USED },
{ "pictureheadline", LISTITEM_PICTURE_HEADLINE },
{ "picturecolour", LISTITEM_PICTURE_COLOUR },
{ "picturelightsource", LISTITEM_PICTURE_LIGHT_SOURCE },
{ "picturemeteringmode", LISTITEM_PICTURE_METERING_MODE },
{ "pictureobjectname", LISTITEM_PICTURE_OBJECT_NAME },
{ "pictureorientation", LISTITEM_PICTURE_ORIENTATION },
{ "pictureprocess", LISTITEM_PICTURE_PROCESS },
{ "picturereferenceservice", LISTITEM_PICTURE_REF_SERVICE },
{ "picturesource", LISTITEM_PICTURE_SOURCE },
{ "picturespecialinstructions", LISTITEM_PICTURE_SPEC_INSTR },
{ "picturestate", LISTITEM_PICTURE_STATE },
{ "picturesupplementalcategories", LISTITEM_PICTURE_SUP_CATEGORIES },
{ "picturetransmissionreference", LISTITEM_PICTURE_TX_REFERENCE },
{ "picturewhitebalance", LISTITEM_PICTURE_WHITE_BALANCE },
{ "pictureimagetype", LISTITEM_PICTURE_IMAGETYPE },
{ "picturesublocation", LISTITEM_PICTURE_SUBLOCATION },
{ "pictureiptctime", LISTITEM_PICTURE_TIMECREATED },
{ "picturegpslat", LISTITEM_PICTURE_GPS_LAT },
{ "picturegpslon", LISTITEM_PICTURE_GPS_LON },
{ "picturegpsalt", LISTITEM_PICTURE_GPS_ALT },
Expand Down Expand Up @@ -617,6 +653,8 @@ const infomap slideshow[] = {{ "ispaused", SLIDESHOW_ISPAUSED },
{ "israndom", SLIDESHOW_ISRANDOM }};

const int picture_slide_map[] = {/* LISTITEM_PICTURE_RESOLUTION => */ SLIDE_RESOLUTION,
/* LISTITEM_PICTURE_LONGDATE => */ SLIDE_EXIF_LONG_DATE,
/* LISTITEM_PICTURE_LONGDATETIME => */ SLIDE_EXIF_LONG_DATE_TIME,
/* LISTITEM_PICTURE_DATE => */ SLIDE_EXIF_DATE,
/* LISTITEM_PICTURE_DATETIME => */ SLIDE_EXIF_DATE_TIME,
/* LISTITEM_PICTURE_COMMENT => */ SLIDE_COMMENT,
Expand All @@ -631,6 +669,39 @@ const int picture_slide_map[] = {/* LISTITEM_PICTURE_RESOLUTION => */ SLIDE_RES
/* LISTITEM_PICTURE_EXP_MODE => */ SLIDE_EXIF_EXPOSURE_MODE,
/* LISTITEM_PICTURE_EXP_TIME => */ SLIDE_EXIF_EXPOSURE_TIME,
/* LISTITEM_PICTURE_ISO => */ SLIDE_EXIF_ISO_EQUIV,
/* LISTITEM_PICTURE_AUTHOR => */ SLIDE_IPTC_AUTHOR,
/* LISTITEM_PICTURE_BYLINE => */ SLIDE_IPTC_BYLINE,
/* LISTITEM_PICTURE_BYLINE_TITLE => */ SLIDE_IPTC_BYLINE_TITLE,
/* LISTITEM_PICTURE_CATEGORY => */ SLIDE_IPTC_CATEGORY,
/* LISTITEM_PICTURE_CCD_WIDTH => */ SLIDE_EXIF_CCD_WIDTH,
/* LISTITEM_PICTURE_CITY => */ SLIDE_IPTC_CITY,
/* LISTITEM_PICTURE_URGENCY => */ SLIDE_IPTC_URGENCY,
/* LISTITEM_PICTURE_COPYRIGHT_NOTICE => */ SLIDE_IPTC_COPYRIGHT_NOTICE,
/* LISTITEM_PICTURE_COUNTRY => */ SLIDE_IPTC_COUNTRY,
/* LISTITEM_PICTURE_COUNTRY_CODE => */ SLIDE_IPTC_COUNTRY_CODE,
/* LISTITEM_PICTURE_CREDIT => */ SLIDE_IPTC_CREDIT,
/* LISTITEM_PICTURE_IPTCDATE => */ SLIDE_IPTC_DATE,
/* LISTITEM_PICTURE_DIGITAL_ZOOM => */ SLIDE_EXIF_DIGITAL_ZOOM,
/* LISTITEM_PICTURE_EXPOSURE => */ SLIDE_EXIF_EXPOSURE,
/* LISTITEM_PICTURE_EXPOSURE_BIAS => */ SLIDE_EXIF_EXPOSURE_BIAS,
/* LISTITEM_PICTURE_FLASH_USED => */ SLIDE_EXIF_FLASH_USED,
/* LISTITEM_PICTURE_HEADLINE => */ SLIDE_IPTC_HEADLINE,
/* LISTITEM_PICTURE_COLOUR => */ SLIDE_COLOUR,
/* LISTITEM_PICTURE_LIGHT_SOURCE => */ SLIDE_EXIF_LIGHT_SOURCE,
/* LISTITEM_PICTURE_METERING_MODE => */ SLIDE_EXIF_METERING_MODE,
/* LISTITEM_PICTURE_OBJECT_NAME => */ SLIDE_IPTC_OBJECT_NAME,
/* LISTITEM_PICTURE_ORIENTATION => */ SLIDE_EXIF_ORIENTATION,
/* LISTITEM_PICTURE_PROCESS => */ SLIDE_PROCESS,
/* LISTITEM_PICTURE_REF_SERVICE => */ SLIDE_IPTC_REF_SERVICE,
/* LISTITEM_PICTURE_SOURCE => */ SLIDE_IPTC_SOURCE,
/* LISTITEM_PICTURE_SPEC_INSTR => */ SLIDE_IPTC_SPEC_INSTR,
/* LISTITEM_PICTURE_STATE => */ SLIDE_IPTC_STATE,
/* LISTITEM_PICTURE_SUP_CATEGORIES => */ SLIDE_IPTC_SUP_CATEGORIES,
/* LISTITEM_PICTURE_TX_REFERENCE => */ SLIDE_IPTC_TX_REFERENCE,
/* LISTITEM_PICTURE_WHITE_BALANCE => */ SLIDE_EXIF_WHITE_BALANCE,
/* LISTITEM_PICTURE_IMAGETYPE => */ SLIDE_IPTC_IMAGETYPE,
/* LISTITEM_PICTURE_SUBLOCATION => */ SLIDE_IPTC_SUBLOCATION,
/* LISTITEM_PICTURE_TIMECREATED => */ SLIDE_IPTC_TIMECREATED,
/* LISTITEM_PICTURE_GPS_LAT => */ SLIDE_EXIF_GPS_LATITUDE,
/* LISTITEM_PICTURE_GPS_LON => */ SLIDE_EXIF_GPS_LONGITUDE,
/* LISTITEM_PICTURE_GPS_ALT => */ SLIDE_EXIF_GPS_ALTITUDE };
Expand Down
Loading

0 comments on commit 1e21f00

Please sign in to comment.