Merge svn changes up to r27242

Conflicts:

	Makefile
	configure

5 files changed, 15 insertions, 1 deletions

diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index 7a44dc2576..c3874771aa 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -124,9 +124,18 @@ cd_info_debug(cd_info_t *cd_info) {
 	mp_msg(MSGT_DEMUX, MSGL_INFO, " genre=[%s]\n", cd_info->genre);
 	mp_msg(MSGT_DEMUX, MSGL_INFO, " nb_tracks=%d\n", cd_info->nb_tracks);
 	mp_msg(MSGT_DEMUX, MSGL_INFO, " length= %2d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec);
+
+	mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_ARTIST=%s\n", cd_info->artist);
+	mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_ALBUM=%s\n", cd_info->album);
+	mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_GENRE=%s\n", cd_info->genre);
+	mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_LENGTH_MSF=%02d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec);
+	mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_TRACKS=%d\n", cd_info->nb_tracks);
+
 	current_track = cd_info->first;
 	while( current_track!=NULL ) {
 		mp_msg(MSGT_DEMUX, MSGL_INFO, "  #%2d %2d:%02d.%02d @ %7ld\t[%s] \n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec, current_track->frame_begin, current_track->name);
+		mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_TRACK_%d_NAME=%s\n", current_track->track_nb, current_track->name);
+		mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_TRACK_%d_MSF=%02d:%02d.%02d\n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec);
 		current_track = current_track->next;
 	}
 	mp_msg(MSGT_DEMUX, MSGL_INFO, "================ CD INFO ===  end  =========\n");
diff --git a/stream/librtsp/rtsp.c b/stream/librtsp/rtsp.c
index 932114a762..d69c684c19 100644
--- a/stream/librtsp/rtsp.c
+++ b/stream/librtsp/rtsp.c
@@ -41,6 +41,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <inttypes.h>
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
diff --git a/stream/stream.c b/stream/stream.c
index 227fcf4ea4..be41c29959 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -379,8 +379,10 @@ void stream_reset(stream_t *s){
 
 int stream_control(stream_t *s, int cmd, void *arg){
   if(!s->control) return STREAM_UNSUPPORTED;
+#ifdef USE_STREAM_CACHE
   if (s->cache_pid)
     return cache_do_control(s, cmd, arg);
+#endif
   return s->control(s, cmd, arg);
 }
 
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index b2c455d5d9..2f177eb7bd 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -719,6 +719,8 @@ cddb_resolve(const char *dev, char **xmcd_file) {
 	cddb_data.disc_id = cddb_discid(cddb_data.tracks);
 	cddb_data.anonymous = 1;	// Don't send user info by default
 
+	mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_DISCID=%08lx\n", cddb_data.disc_id);
+
 	// Check if there is a CD in the drive
 	// FIXME: That's not really a good way to check
 	if( cddb_data.disc_id==0 ) {
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index c9af10d517..fa80e9b64b 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -790,7 +790,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
     else if(dvd_device)
       dvd_device_current = dvd_device;
     else
-      dvd_device_current = strdup(DEFAULT_DVD_DEVICE);
+      dvd_device_current = DEFAULT_DVD_DEVICE;
     dvd_set_speed(dvd_device_current, dvd_speed);
 #if defined(__APPLE__) || defined(__DARWIN__)
     /* Dynamic DVD drive selection on Darwin */