From dfa733c50bc02210b5a9df1411d6c2959e06274a Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 5 Jul 2008 11:39:43 +0000 Subject: Add disc ID to -identify output. patch by Mathieu Schroeter, mathieu.schroeter gamesover ch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27206 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_cddb.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'stream') 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 ) { -- cgit v1.2.3 From 462fa761e5f161d4c17f87675286ac591f5bcb3d Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 5 Jul 2008 11:44:13 +0000 Subject: Add some more -identify information for CDDB. patch by Mathieu Schroeter, mathieu.schroeter gamesover ch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27207 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/cdinfo.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'stream') 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"); -- cgit v1.2.3 From 0b2ed65981222c8469761ed70dc85e86a0c3a688 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 5 Jul 2008 14:22:57 +0000 Subject: =?UTF-8?q?Surround=20stream=20cache=20specific=20code=20by=20an?= =?UTF-8?q?=20appropriate=20#ifdef;=20fixes=20linking=20when=20stream=20ca?= =?UTF-8?q?che=20is=20disabled.=20noticed=20by=20Andrea=20Palmat=C3=A8,=20?= =?UTF-8?q?andrea=20amigasoft=20net?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27210 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'stream') diff --git a/stream/stream.c b/stream/stream.c index 19c7bab091..c95dabefb0 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -381,8 +381,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); } -- cgit v1.2.3 From efb1379f7216b90c656c71118fae28aaa2eb7e10 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 6 Jul 2008 18:04:14 +0000 Subject: avoid unnecessary strdup(); patch by Aurel git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27226 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_dvd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream') 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 */ -- cgit v1.2.3 From 3a0ee8a23aff622e13d762b5b5ec5a48059d4268 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 8 Jul 2008 08:20:39 +0000 Subject: Add missing #include , fixes the warnings: stream/librtsp/rtsp.c: In function 'write_stream': stream/librtsp/rtsp.c:68: warning: implicit declaration of function 'send' stream/librtsp/rtsp.c: In function 'read_stream': stream/librtsp/rtsp.c:95: warning: implicit declaration of function 'recv' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27234 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/librtsp/rtsp.c | 1 + 1 file changed, 1 insertion(+) (limited to 'stream') 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 #include #include +#include #include #ifdef HAVE_WINSOCK2 #include -- cgit v1.2.3