46 lines
2.1 KiB
Plaintext
46 lines
2.1 KiB
Plaintext
$NetBSD: patch-replace-glob3,v 1.2 2012/12/17 12:51:32 drochner Exp $
|
|
|
|
--- metadata.c.orig 2012-06-29 21:11:29.000000000 +0000
|
|
+++ metadata.c
|
|
@@ -25,14 +25,15 @@
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
+#include <libgen.h>
|
|
|
|
#include <libexif/exif-loader.h>
|
|
#include "image_utils.h"
|
|
#include <jpeglib.h>
|
|
#include <setjmp.h>
|
|
-#include <avutil.h>
|
|
-#include <avcodec.h>
|
|
-#include <avformat.h>
|
|
+#include <libavutil/avutil.h>
|
|
+#include <libavcodec/avcodec.h>
|
|
+#include <libavformat/avformat.h>
|
|
#include "tagutils/tagutils.h"
|
|
|
|
#include "upnpglobalvars.h"
|
|
@@ -194,8 +195,8 @@ check_for_captions(const char * path, sq
|
|
/* If we weren't given a detail ID, look for one. */
|
|
if( !detailID )
|
|
{
|
|
- id = sql_get_text_field(db, "SELECT ID from DETAILS where PATH glob '%q.*'"
|
|
- " and MIME glob 'video/*' limit 1", file);
|
|
+ id = sql_get_text_field(db, "SELECT ID from DETAILS where (PATH > '%q.' and PATH <= '%q.z'"
|
|
+ " and MIME > 'video/' and MIME <= 'video/z') limit 1", file, file);
|
|
if( id )
|
|
{
|
|
//DEBUG DPRINTF(E_DEBUG, L_METADATA, "New file %s looks like a caption file.\n", path);
|
|
@@ -504,8 +505,8 @@ GetAudioMetadata(const char * path, char
|
|
" (PATH, SIZE, TIMESTAMP, DURATION, CHANNELS, BITRATE, SAMPLERATE, DATE,"
|
|
" TITLE, CREATOR, ARTIST, ALBUM, GENRE, COMMENT, DISC, TRACK, DLNA_PN, MIME, ALBUM_ART) "
|
|
"VALUES"
|
|
- " (%Q, %lld, %ld, '%s', %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %Q, '%s', %lld);",
|
|
- path, (long long)file.st_size, file.st_mtime, m.duration, song.channels, song.bitrate, song.samplerate, m.date,
|
|
+ " (%Q, %lld, %lld, '%s', %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %Q, '%s', %lld);",
|
|
+ path, (long long)file.st_size, (long long)file.st_mtime, m.duration, song.channels, song.bitrate, song.samplerate, m.date,
|
|
m.title, m.creator, m.artist, m.album, m.genre, m.comment, song.disc, song.track,
|
|
m.dlna_pn, song.mime?song.mime:m.mime, album_art);
|
|
if( ret != SQLITE_OK )
|