0.10.2-rc2

ChangeLog

@@ -6,6 +6,10 @@ ver 0.10.2 (2004/3/25)
 5) Pause now closes the music device, and reopens it on resuming
 6) Fix unnecessary big endian byte swapping
 7) If locale is "C" or "POSIX", then use ISO-8859-1 as the fs charset
+8) Fix a bug where alsamixer wasn't detect volume changes
+9) For alsa and software mixer, show volume to be the same as it was set (even if its not the exact volume)
+10) Report bitrate for wave files
+11) Computer song length of CBR mp3's more accurately
 
 ver 0.10.1 (2004/3/7)
 1) Check to see if we need to add "-lm" when linking mpd

configure

@@ -10020,11 +10020,13 @@ echo "${ECHO_T}$ac_cv_header_langinfo_h" >&6
 
 fi
 if test $ac_cv_header_langinfo_h = yes; then
-
+  enable_langinfo=yes;
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LANGINFO 1
 _ACEOF
 
+else
+  enable_langinfo=no
 fi
 
 
@@ -10158,11 +10160,13 @@ echo "${ECHO_T}$ac_cv_header_locale_h" >&6
 
 fi
 if test $ac_cv_header_locale_h = yes; then
-
+  enable_locale=yes;
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LOCALE 1
 _ACEOF
 
+else
+  enable_locale=no
 fi
 
 
@@ -10677,10 +10681,10 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6
 
 fi
 if test $ac_cv_header_sys_soundcard_h = yes; then
-  :
+  enable_oss=yes
 else
-  { echo "$as_me:$LINENO: WARNING: Soundcard headers not found -- disabling mixer" >&5
-echo "$as_me: WARNING: Soundcard headers not found -- disabling mixer" >&2;};
+  { echo "$as_me:$LINENO: WARNING: Soundcard headers not found -- disabling OSS mixer" >&5
+echo "$as_me: WARNING: Soundcard headers not found -- disabling OSS mixer" >&2;};enable_oss=no;
 cat >>confdefs.h <<\_ACEOF
 #define NO_OSS_MIXER 1
 _ACEOF
@@ -10709,12 +10713,7 @@ AP_maGiC_VALUE
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "AP_maGiC_VALUE" >/dev/null 2>&1; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALSA 1
-_ACEOF
-
-MPD_LIBS="$MPD_LIBS -lasound"
+  enable_alsa=yes
 echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
@@ -10725,6 +10724,67 @@ fi
 rm -f conftest*
 
 
+if test x$enable_alsa = xyes; then
+	echo "$as_me:$LINENO: checking for main in -lasound" >&5
+echo $ECHO_N "checking for main in -lasound... $ECHO_C" >&6
+if test "${ac_cv_lib_asound_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lasound  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_asound_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_asound_main=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_asound_main" >&5
+echo "${ECHO_T}$ac_cv_lib_asound_main" >&6
+if test $ac_cv_lib_asound_main = yes; then
+  MPD_LIBS="$MPD_LIBS -lasound";
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALSA 1
+_ACEOF
+
+else
+  enable_alsa=no
+fi
+
+fi
+
 if test x$enable_iconv = xyes; then
   	if test "x$iconv_libraries" != "x" ; then
   		ICONV_LIBS="-L$iconv_libraries"
@@ -14205,6 +14265,42 @@ fi
 
 echo ""
 echo "########### MPD CONFIGURATION ############"
+echo ""
+echo "Volume Mixer Support:"
+if test x$enable_oss = xyes; then
+	echo "OSS mixer support .............enabled"
+else
+	echo "OSS mixer support .............disabled"
+fi
+
+if test x$enable_alsa = xyes; then
+	echo "Alsa mixer support ............enabled"
+else
+	echo "Alsa mixer support ............disabled"
+fi
+
+echo ""
+echo "i18n Support:"
+if test x$enable_iconv = xyes; then
+	echo "iconv support .................enabled"
+else
+	echo "iconv support .................disabled"
+fi
+
+if test x$enable_locale = xyes; then
+	echo "locale support ................enabled"
+else
+	echo "locale support ................disabled"
+fi
+
+if test x$enable_langinfo = xyes; then
+	echo "langinfo support ..............enabled"
+else
+	echo "langinfo support ..............disabled"
+fi
+
+echo ""
+echo "Audio Format Support:"
 if test x$enable_id3 = xyes; then
 	echo "ID3 tag support ...............enabled"
 	if test x$use_mpd_id3tag = xyes; then
@@ -14252,5 +14348,7 @@ else
 fi
 
 echo ""
+echo "##########################################"
+echo ""
 echo "You are now ready to compile MPD"
 echo "Type \"make\" to compile MPD"

configure.ac

@@ -66,8 +66,8 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
 
 AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",)
 
-AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present]),)
-AC_CHECK_HEADER(locale.h,AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present]),)
+AC_CHECK_HEADER(langinfo.h,[enable_langinfo=yes;AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present])],enable_langinfo=no)
+AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no)
 
 if test x$enable_ipv6 = xyes; then
 	AC_MSG_CHECKING(for ipv6)
@@ -89,7 +89,7 @@ AP_maGiC_VALUE
 fi
 
 XIPH_PATH_AO(MPD_LIBS="$MPD_LIBS $AO_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AO_CFLAGS",AC_MSG_ERROR(Must have libao installed!!!))
-AC_CHECK_HEADER(sys/soundcard.h,,[AC_MSG_WARN(Soundcard headers not found -- disabling mixer);AC_DEFINE(NO_OSS_MIXER,1,[Define to disable OSS mixer support])])
+AC_CHECK_HEADER(sys/soundcard.h,enable_oss=yes,[AC_MSG_WARN(Soundcard headers not found -- disabling OSS mixer);enable_oss=no;AC_DEFINE(NO_OSS_MIXER,1,[Define to disable OSS mixer support])])
 
 AC_MSG_CHECKING(for alsa)
 AC_EGREP_CPP([AP_maGiC_VALUE],
@@ -101,12 +101,15 @@ AP_maGiC_VALUE
 #endif
 #endif
 ],
-AC_DEFINE(HAVE_ALSA,1,[Define if alsa support is present])
-MPD_LIBS="$MPD_LIBS -lasound"
+enable_alsa=yes
 AC_MSG_RESULT([yes]),
 AC_MSG_RESULT([no])
 )
 
+if test x$enable_alsa = xyes; then
+	AC_CHECK_LIB(asound,main,[MPD_LIBS="$MPD_LIBS -lasound";AC_DEFINE(HAVE_ALSA,1,[Define if alsa support is present])],enable_alsa=no)
+fi
+
 if test x$enable_iconv = xyes; then
   	if test "x$iconv_libraries" != "x" ; then
   		ICONV_LIBS="-L$iconv_libraries"
@@ -372,6 +375,42 @@ AC_OUTPUT(src/mp4ff/Makefile doc/Makefile src/Makefile Makefile )
 
 echo ""
 echo "########### MPD CONFIGURATION ############"
+echo ""
+echo "Volume Mixer Support:"
+if test x$enable_oss = xyes; then
+	echo "OSS mixer support .............enabled"
+else
+	echo "OSS mixer support .............disabled"
+fi
+
+if test x$enable_alsa = xyes; then
+	echo "Alsa mixer support ............enabled"
+else
+	echo "Alsa mixer support ............disabled"
+fi
+
+echo ""
+echo "i18n Support:"
+if test x$enable_iconv = xyes; then
+	echo "iconv support .................enabled"
+else
+	echo "iconv support .................disabled"
+fi
+
+if test x$enable_locale = xyes; then
+	echo "locale support ................enabled"
+else
+	echo "locale support ................disabled"
+fi
+
+if test x$enable_langinfo = xyes; then
+	echo "langinfo support ..............enabled"
+else
+	echo "langinfo support ..............disabled"
+fi
+
+echo ""
+echo "Audio Format Support:"
 if test x$enable_id3 = xyes; then
 	echo "ID3 tag support ...............enabled"
 	if test x$use_mpd_id3tag = xyes; then
@@ -419,5 +458,7 @@ else
 fi
 
 echo ""
+echo "##########################################"
+echo ""
 echo "You are now ready to compile MPD"
 echo "Type \"make\" to compile MPD"

doc/mpdconf.example

-# required
+# MPD CONFIG FILE
+# For a full description of all config parameters,
+# Check the mpd man page, "man mpd".
+
+
+########## REQUIRED ###############
 port 			"2100"
-music_directory 	"~/mp3"
-playlist_directory 	"~/playlists"
-log_file 		"~/mpd.log"
-error_file 		"~/mpd.error"
-
-# optional
-mixer_type		"oss"
-mixer_device 		"/dev/mixer"
+music_directory 	"~/music"
+playlist_directory 	"~/.mpd/playlists"
+log_file 		"~/.mpd/mpd.log"
+error_file 		"~/.mpd/mpd.error"
+###################################
+
+
+###################################
+# EVERYTHING ELSE IS OPTIONAL
+###################################
+
+
+######### FILESYSTEM SETTINGS ###########
+# If filenames or directory names don't
+#     display correctly, set the character 
+#     set (encoding) for the filesystem
+#     here. The fileystem encoding is 
+#     typically "ISO-8859-1" or "UTF-8".
+#     After changing fileystem_charset,
+#     recreate the db: mpd --create-db
+#filesystem_charset "ISO-8859-1"
+#########################################
+
+
+########### OPTIONAL FILES ##############
+# Location of DB file 
+#db_file		"~/.mpd/mpddb"
+#
+# State file for storing state of mpd 
+#     when it is shutdown.  MPD will restore
+#     the state (i.e. load playlist, start
+#     playing, etc) upon restart.
+#state_file		"~/.mpd/mpdstate"
+##########################################
+
+
+######### VOLUME MIXER ############
+# for OSS Mixer
+#mixer_type		"oss"
+#mixer_device 		"/dev/mixer"
 #mixer_control		"Pcm"
-# mixer_type is typically "oss", "alsa", or "software"
+
+# for Alsa Mixer 
 #mixer_type		"alsa"
 #mixer_device		"default"
 #mixer_control		"PCM"
-# ao_driver is typically "oss" or "alsa09"
+
+# for Software Mixer
+#mixer_type		"software"
+##################################
+
+
+######### AUDIO OUTPUT ###########
+# for OSS Audio Output
 #ao_driver 		"oss"
 #ao_driver_options 	"dsp=/dev/dsp"
+
+# for ALSA Audio Output
+#ao_driver		"alsa09"
+#ao_driver_options	"dev=hw:0,0"
+
+# misc audio output options
 #audio_write_size	"1024"
-max_playlist_length 	"4096"
-buffer_before_play 	"25%"
-buffer_size		"2048"
-#db_file		"~/playlists/.mpddb"
-#state_file		"~/playlists/.mpdstate"
-#user			"shank"
-connection_timeout 	"60"
-max_connections 	"5"
-max_command_list_size 	"2048"
-max_output_buffer_size 	"2048"
-save_absolute_paths_in_playlists "no"
-# log_level can be "default", "secure", "verbose"
-log_level		"default"
-# when bind_to_address is set to "any", MPD binds all available addresses
-bind_to_address 	"any"
-#password 		"password@read,add,control,admin"
+##################################
+
+
+#### OUTPUT BUFFER SETTINGS ######
+#buffer_size		"2048"
+#buffer_before_play 	"25%"
+##################################
+
+
+########### SECURITY SETTINGS ############
+# if you start mpd as root, its recommended
+#     you specify a a user for mpd to run.
+#user 		"nobody"
+
+# to only allow connections from localhost
+#bind_to_address 	"localhost"
+
+# Specify one or more passwords required to
+#     access mpd:
+#password 		"password1@read,add,control,admin"
+#password 		"password2@read"
+
+# Specify permissions used by default when no password is 
+#     given by for a connection/client.
 #default_permissions	"read,add,control,admin"
-#filesystem_charset	"UTF-8"
+##########################################
+
+
+########### MISC OPTIONS #################
+#max_playlist_length 	"4096"
+#connection_timeout 	"60"
+#max_connections 	"5"
+#max_command_list_size 	"2048"
+#max_output_buffer_size 	"2048"
+#save_absolute_paths_in_playlists "no"
+
+# log_level can be "default", "secure", "verbose"
+#log_level		"default"
+#########################################

src/audiofile_decode.c

@@ -32,6 +32,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <audiofile.h>
 
 int getAudiofileTotalTime(char * file)
@@ -53,10 +56,17 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
 	int fs, frame_count;
 	AFfilehandle af_fp;
 	int bits;
-		
+	mpd_uint16 bitRate;
+	struct stat st;
+
+	if(stat(dc->file,&st) < 0) {
+		ERROR("failed to stat: %s\n",dc->file);
+		return -1;
+	}
+
 	af_fp = afOpenFile(dc->file,"r", NULL);
 	if(af_fp == AF_NULL_FILEHANDLE) {
-		ERROR("failed to open %s\n",dc->file);
+		ERROR("failed to open: %s\n",dc->file);
 		return -1;
 	}
 
@@ -68,6 +78,8 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
 	frame_count = afGetFrameCount(af_fp,AF_DEFAULT_TRACK);
 	
 	cb->totalTime = ((float)frame_count/(float)af->sampleRate);
+
+	bitRate = st.st_size*8.0/cb->totalTime/1024.0+0.5;
 	
 	if (af->bits != 8 && af->bits != 16) {
 		ERROR("Only 8 and 16-bit files are supported. %s is %i-bit\n",
@@ -110,6 +122,7 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
 				
 				current += ret;
 				cb->times[cb->end] = (float)current/(float)af->sampleRate;
+				cb->bitRate[cb->end] = bitRate;
 				
 				++cb->end;
 				

src/mp3_decode.c

@@ -190,7 +190,9 @@ int decodeNextFrameHeader(mp3DecodeData * data) {
 	}
 	if(mad_header_decode(&data->frame.header,&data->stream)) {
 #ifdef HAVE_ID3TAG
-		if((data->stream).error==MAD_ERROR_LOSTSYNC) {
+		if((data->stream).error==MAD_ERROR_LOSTSYNC && 
+				(data->stream).this_frame) 
+		{
 			signed long tagsize = id3_tag_query(
 					(data->stream).this_frame,
 					(data->stream).bufend-
@@ -341,11 +343,18 @@ int decodeFirstFrame(mp3DecodeData * data) {
 		}
 	}
 	else {
+		size_t offset = data->currentOffset;
 		mad_timer_t duration = data->frame.header.duration;
 		float frameTime = ((float)mad_timer_count(duration,
 					MAD_UNITS_MILLISECONDS))/1000;
 		fstat(fileno(data->fp),&filestat);
-		data->totalTime = (filestat.st_size*8.0)/
+		if(data->stream.this_frame!=NULL) {
+			offset-= data->stream.bufend-data->stream.this_frame;
+		}
+		else {
+			offset-= data->stream.bufend-data->stream.buffer;
+		}
+		data->totalTime = ((filestat.st_size-offset)*8.0)/
 					(data->frame).header.bitrate;
 		data->maxFrames = data->totalTime/frameTime+FRAMES_CUSHION;
 	}
@@ -432,12 +441,12 @@ int mp3Read(mp3DecodeData * data, Buffer * cb, DecoderControl * dc) {
 		data->frameOffset[data->currentFrame] = 
 				data->currentOffset;
 		if(data->stream.this_frame!=NULL) {
-			data->frameOffset[data->currentFrame]+= 
-					data->stream.this_frame-
-					data->stream.buffer;
+			data->frameOffset[data->currentFrame]-= 
+					data->stream.bufend-
+					data->stream.this_frame;
 		}
 		else {
-			data->frameOffset[data->currentFrame]+= 
+			data->frameOffset[data->currentFrame]-= 
 					data->stream.bufend-data->stream.buffer;
 		}
 		data->times[data->currentFrame] = data->timer;

src/volume.c

@@ -47,6 +47,8 @@
 int volume_mixerType = VOLUME_MIXER_TYPE_SOFTWARE;
 char * volume_mixerDevice;
 
+int volume_softwareSet = -1;
+
 #ifndef NO_OSS_MIXER
 int volume_ossFd;
 int volume_ossControl = SOUND_MIXER_VOLUME;
@@ -57,6 +59,7 @@ snd_mixer_t * volume_alsaMixerHandle = NULL;
 snd_mixer_elem_t * volume_alsaElem;
 long volume_alsaMin;
 long volume_alsaMax;
+int volume_alsaSet = -1;
 #endif
 
 #ifndef NO_OSS_MIXER
@@ -84,7 +87,7 @@ int prepOssMixer(char * device) {
 			/* eliminate spaces at the end */
 			j = strlen(dup)-1;
 			while(j>=0 && dup[j]==' ') dup[j--] = '\0';
-			if(strcmp(dup,getConf()[CONF_MIXER_CONTROL])==0) {
+			if(strcasecmp(dup,getConf()[CONF_MIXER_CONTROL])==0) {
 				free(dup);
 				break;
 			}
@@ -200,7 +203,7 @@ int prepAlsaMixer(char * card) {
 			if(snd_mixer_elem_get_type(elem)
 					==SND_MIXER_ELEM_SIMPLE) 
 			{
-				if(strcmp(getConf()[CONF_MIXER_CONTROL],
+				if(strcasecmp(getConf()[CONF_MIXER_CONTROL],
 						snd_mixer_selem_get_name(elem))
 						==0)
 				{
@@ -245,6 +248,8 @@ int getAlsaVolumeLevel() {
 	long min = volume_alsaMin;
 	int err;
 
+	snd_mixer_handle_events(volume_alsaMixerHandle);
+
 	if((err = snd_mixer_selem_get_playback_volume(volume_alsaElem,
 		SND_MIXER_SCHN_FRONT_LEFT,&level))<0) {
 		ERROR("problems getting alsa volume: %s\n",snd_strerror(err));
@@ -252,8 +257,12 @@ int getAlsaVolumeLevel() {
 	}
 
 	snd_mixer_selem_get_playback_volume(volume_alsaElem,
-		SND_MIXER_SCHN_FRONT_LEFT,&level);
-	ret =  (int)(100*(((float)(level-min))/(max-min))+0.5);
+			SND_MIXER_SCHN_FRONT_LEFT,&level);
+	ret = ((volume_alsaSet/100.0)*(max-min)+min)+0.5;
+	if(volume_alsaSet>0 && ret==level) {
+		ret = volume_alsaSet;
+	}
+	else ret =  (int)(100*(((float)(level-min))/(max-min))+0.5);
 
 	return ret;
 }
@@ -261,10 +270,13 @@ int getAlsaVolumeLevel() {
 int changeAlsaVolumeLevel(FILE * fp, int change, int rel) {
 	float vol;
 	long level;
+	long test;
 	long max = volume_alsaMax;
 	long min = volume_alsaMin;
 	int err;
 
+	snd_mixer_handle_events(volume_alsaMixerHandle);
+
 	if((err = snd_mixer_selem_get_playback_volume(volume_alsaElem,
 		SND_MIXER_SCHN_FRONT_LEFT,&level))<0) {
 		myfprintf(fp,"%s problems getting volume\n",
@@ -274,12 +286,20 @@ int changeAlsaVolumeLevel(FILE * fp, int change, int rel) {
 	}
 
 	if (rel) {
-		vol =  100.0*(((float)(level-min))/(max-min));
+		test = ((volume_alsaSet/100.0)*(max-min)+min)+0.5;
+		if(volume_alsaSet >= 0 && level==test) {
+			vol = volume_alsaSet;
+		}
+		else vol =  100.0*(((float)(level-min))/(max-min));
 		vol+=change;
 	}
 	else
 		vol = change;
 
+	volume_alsaSet = vol+0.5;
+	volume_alsaSet = volume_alsaSet>100 ? 100 : 
+			(volume_alsaSet<0 ? 0 : volume_alsaSet);
+
 	level = (long)(((vol/100.0)*(max-min)+min)+0.5);
 	level = level>max?max:level;
 	level = level<min?min:level;
@@ -361,6 +381,10 @@ void openVolumeDevice() {
 }
 
 int getSoftwareVolume() {
+	if(volume_softwareSet >= 0) {
+		return volume_softwareSet;
+	}
+
 	return 50*log((getPlayerSoftwareVolume()*(M_E*M_E-1)/100.0)+1)+0.5;
 }
 
@@ -389,6 +413,8 @@ int changeSoftwareVolume(FILE * fp, int change, int rel) {
 	if(new>100) new = 100;
 	else if(new<0) new = 0;
 
+	volume_softwareSet = new;
+
 	new = 100.0*(exp(new/50.0)-1)/(M_E*M_E-1)+0.5;
 
 	setPlayerSoftwareVolume(new);