head	1.3;
access;
symbols
	pkgsrc-2020Q3:1.2.0.6
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.4
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.2
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.1.0.112
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.108
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.106
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.104
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.102
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.100
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.98
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.96
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.94
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.92
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.88
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.86
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.84
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.82
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.80
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.78
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.76
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.74
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.72
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.70
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.68
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.66
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.64
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.62
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.60
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.58
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.56
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.54
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.52
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.50
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.48
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.46
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.44
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.42
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.40
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.38
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.36
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.34
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.32
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.30
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.28
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.26
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.24
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.22
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.20
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.18
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.16
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.14
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.12
	pkgsrc-2008Q1:1.1.0.10
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.8
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.6
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.4
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.2
	pkgsrc-2007Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2020.11.02.14.04.42;	author nia;	state dead;
branches;
next	1.2;
commitid	yW3iTgKGVQMyPjuC;

1.2
date	2020.03.26.21.51.24;	author joerg;	state Exp;
branches;
next	1.1;
commitid	PBMDxcinuHB8wX1C;

1.1
date	2007.02.09.20.32.38;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@audio: Remove daapd, successor forked-daapd
@
text
@$NetBSD: patch-af,v 1.2 2020/03/26 21:51:24 joerg Exp $

--- db.cc.orig	2006-03-05 13:39:37.000000000 +0000
+++ db.cc
@@@@ -180,14 +180,14 @@@@ void Database::addMp3( std::string& path
 	
 		if( getId3TextFrame( tag, "TRCK", s ) == 0 ) {
 			song->tracknumber = strtol( s.c_str(), NULL, 10 );
-			char *sp;
+			const char *sp;
 			if( ( sp = strchr( s.c_str(), '/' ) ) != 0 ) 
 				song->trackcount = strtol( sp+1, NULL, 10 );
 		}
 					
 		if( getId3TextFrame( tag, "TPOS", s ) == 0 ) {
 			song->discnumber = strtol( s.c_str(), NULL, 10 );
-			char *sp;
+			const char *sp;
 			if( ( sp = strchr( s.c_str(), '/' ) ) != 0 ) 
 				song->disccount = strtol( sp+1, NULL, 10 );
 		}
@@@@ -325,7 +325,7 @@@@ void Database::addM4a( std::string& path
 			MP4TrackId trackId = MP4FindTrackId(mp4file, 0);
 			u32 timeScale = MP4GetTrackTimeScale(mp4file, trackId);
 			MP4Duration trackDuration = MP4GetTrackDuration(mp4file, trackId);
-			double msDuration = UINT64_TO_DOUBLE(MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE));
+			double msDuration = (double)MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE);
 			u32 avgBitRate = MP4GetTrackBitRate(mp4file, trackId);
 			song->time = (u32) (msDuration);
 			song->bitrate = (u16) ((avgBitRate + 500) / 1000);
@@@@ -413,7 +413,7 @@@@ int Database::getTypeFromExtension( std:
 	// we just trust the user that files with extension
 	// .mp3 are really mp3 files etc.
 	// metadata in the filesystem would be cool :(
-	char *pointPos;
+	const char *pointPos;
 	if( ( pointPos = strrchr( fileName.c_str(), '.' ) ) != 0 ) {
 		if( strlen( pointPos ) >= 5 ) {
 			if( strncasecmp( pointPos, ".aiff", 5 ) == 0 ) {
@


1.2
log
@Fix const correctness.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.1 2007/02/09 20:32:38 drochner Exp $
@


1.1
log
@build against libmp4v2 instead of the full mpeg4ip and bump PKGREVISION
where the default build is affected
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- db.cc.orig	2007-02-09 16:49:38.000000000 +0100
d5 17
d31 9
@