printf converted to mp_msg; made static many unnecessarily global symbols

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15627 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 37 insertions, 39 deletions

diff --git a/libmpdemux/asf_mmst_streaming.c b/libmpdemux/asf_mmst_streaming.c
index 699d6b2e9e..18d56efe4f 100644
--- a/libmpdemux/asf_mmst_streaming.c
+++ b/libmpdemux/asf_mmst_streaming.c
@@ -112,7 +112,7 @@ static void send_command (int s, int command, uint32_t switches,
     memset(&cmd.buf[48 + length], 0, 8 - (length & 7));
 
   if (send (s, cmd.buf, len8*8+48, 0) != (len8*8+48)) {
-    printf ("write error\n");
+    mp_msg(MSGT_NETWORK,MSGL_ERR,"write error\n");
   }
 }
 
@@ -160,7 +160,7 @@ static void get_answer (int s)
 
     len = recv (s, data, BUF_SIZE, 0) ;
     if (!len) {
-      printf ("\nalert! eof\n");
+      mp_msg(MSGT_NETWORK,MSGL_ERR,"\nalert! eof\n");
       return;
     }
 
@@ -188,7 +188,7 @@ static int get_data (int s, char *buf, size_t count)
     total += len;
 
     if (len != 0) {
-//      printf ("[%d/%d]", total, count);
+//      mp_msg(MSGT_NETWORK,MSGL_INFO,"[%d/%d]", total, count);
       fflush (stdout);
     }
 
@@ -207,7 +207,7 @@ static int get_header (int s, uint8_t *header, streaming_ctrl_t *streaming_ctrl)
 
   while (1) {
     if (!get_data (s, pre_header, 8)) {
-      printf ("pre-header read failed\n");
+      mp_msg(MSGT_NETWORK,MSGL_ERR,"pre-header read failed\n");
       return 0;
     }
     if (pre_header[4] == 0x02) {
@@ -216,7 +216,7 @@ static int get_header (int s, uint8_t *header, streaming_ctrl_t *streaming_ctrl)
       
       packet_len = (pre_header[7] << 8 | pre_header[6]) - 8;
 
-//      printf ("asf header packet detected, len=%d\n", packet_len);
+//      mp_msg(MSGT_NETWORK,MSGL_INFO,"asf header packet detected, len=%d\n", packet_len);
 
       if (packet_len < 0 || packet_len > HDR_BUF_SIZE - header_len) {
         mp_msg(MSGT_NETWORK, MSGL_FATAL, "Invalid header size, giving up\n");
@@ -224,7 +224,7 @@ static int get_header (int s, uint8_t *header, streaming_ctrl_t *streaming_ctrl)
       }
 
       if (!get_data (s, &header[header_len], packet_len)) {
-	printf ("header data read failed\n");
+	mp_msg(MSGT_NETWORK,MSGL_ERR,"header data read failed\n");
 	return 0;
       }
 
@@ -237,7 +237,7 @@ static int get_header (int s, uint8_t *header, streaming_ctrl_t *streaming_ctrl)
 				return -1;
  	 }
 
-     //	printf ("get header packet finished\n");
+     //	mp_msg(MSGT_NETWORK,MSGL_INFO,"get header packet finished\n");
 
 	return (header_len);
 
@@ -250,13 +250,13 @@ static int get_header (int s, uint8_t *header, streaming_ctrl_t *streaming_ctrl)
       char data[BUF_SIZE];
 
       if (!get_data (s, (char*)&packet_len, 4)) {
-	printf ("packet_len read failed\n");
+	mp_msg(MSGT_NETWORK,MSGL_ERR,"packet_len read failed\n");
 	return 0;
       }
       
       packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4;
       
-//      printf ("command packet detected, len=%d\n", packet_len);
+//      mp_msg(MSGT_NETWORK,MSGL_INFO,"command packet detected, len=%d\n", packet_len);
 
       if (packet_len < 0 || packet_len > BUF_SIZE) {
         mp_msg(MSGT_NETWORK, MSGL_FATAL,
@@ -265,20 +265,20 @@ static int get_header (int s, uint8_t *header, streaming_ctrl_t *streaming_ctrl)
       }
       
       if (!get_data (s, data, packet_len)) {
-	printf ("command data read failed\n");
+	mp_msg(MSGT_NETWORK,MSGL_ERR,"command data read failed\n");
 	return 0;
       }
       
       command = get_32 (data, 24) & 0xFFFF;
       
-//      printf ("command: %02x\n", command);
+//      mp_msg(MSGT_NETWORK,MSGL_INFO,"command: %02x\n", command);
       
       if (command == 0x1b) 
 	send_command (s, 0x1b, 0, 0, 0, data);
       
     }
 
-//    printf ("get header packet succ\n");
+//    mp_msg(MSGT_NETWORK,MSGL_INFO,"get header packet succ\n");
   }
 }
 
@@ -308,7 +308,7 @@ static int interp_header (uint8_t *header, int header_len)
       | ((uint64_t)header[i+6]<<48) | ((uint64_t)header[i+7]<<56);
     i += 8;
     
-//    printf ("guid found: %016llx%016llx\n", guid_1, guid_2);
+//    mp_msg(MSGT_NETWORK,MSGL_INFO,"guid found: %016llx%016llx\n", guid_1, guid_2);
 
     length = (uint64_t)header[i] | ((uint64_t)header[i+1]<<8) 
       | ((uint64_t)header[i+2]<<16) | ((uint64_t)header[i+3]<<24)
@@ -318,14 +318,14 @@ static int interp_header (uint8_t *header, int header_len)
     i += 8;
 
     if ( (guid_1 == 0x6cce6200aa00d9a6ULL) && (guid_2 == 0x11cf668e75b22630ULL) ) {
-      printf ("header object\n");
+      mp_msg(MSGT_NETWORK,MSGL_INFO,"header object\n");
     } else if ((guid_1 == 0x6cce6200aa00d9a6ULL) && (guid_2 == 0x11cf668e75b22636ULL)) {
-      printf ("data object\n");
+      mp_msg(MSGT_NETWORK,MSGL_INFO,"data object\n");
     } else if ((guid_1 == 0x6553200cc000e48eULL) && (guid_2 == 0x11cfa9478cabdca1ULL)) {
 
       packet_length = get_32(header, i+92-24);
 
-      printf ("file object, packet length = %d (%d)\n",
+      mp_msg(MSGT_NETWORK,MSGL_INFO,"file object, packet length = %d (%d)\n",
 	      packet_length, get_32(header, i+96-24));
 
 
@@ -333,20 +333,20 @@ static int interp_header (uint8_t *header, int header_len)
 
       int stream_id = header[i+48] | header[i+49] << 8;
 
-      printf ("stream object, stream id: %d\n", stream_id);
+      mp_msg(MSGT_NETWORK,MSGL_INFO,"stream object, stream id: %d\n", stream_id);
 
       if (num_stream_ids < MAX_STREAMS) {
       stream_ids[num_stream_ids] = stream_id;
       num_stream_ids++;
       } else {
-        printf ("too many id, stream skipped");
+        mp_msg(MSGT_NETWORK,MSGL_ERR,"too many id, stream skipped");
       }
       
     } else {
-      printf ("unknown object\n");
+      mp_msg(MSGT_NETWORK,MSGL_WARN,"unknown object\n");
     }
 
-//    printf ("length    : %lld\n", length);
+//    mp_msg(MSGT_NETWORK,MSGL_INFO,"length    : %lld\n", length);
 
     i += length-24;
 
@@ -362,12 +362,12 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl)
   char           data[BUF_SIZE];
 
   if (!get_data (s, pre_header, 8)) {
-    printf ("pre-header read failed\n");
+    mp_msg(MSGT_NETWORK,MSGL_ERR,"pre-header read failed\n");
     return 0;
   }
 
 //  for (i=0; i<8; i++)
-//    printf ("pre_header[%d] = %02x (%d)\n",
+//    mp_msg(MSGT_NETWORK,MSGL_INFO,"pre_header[%d] = %02x (%d)\n",
 //	    i, pre_header[i], pre_header[i]);
 
   if (pre_header[4] == 0x04) {
@@ -376,7 +376,7 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl)
 
     packet_len = (pre_header[7] << 8 | pre_header[6]) - 8;
 
-//    printf ("asf media packet detected, len=%d\n", packet_len);
+//    mp_msg(MSGT_NETWORK,MSGL_INFO,"asf media packet detected, len=%d\n", packet_len);
 
     if (packet_len < 0 || packet_len > BUF_SIZE) {
       mp_msg(MSGT_NETWORK, MSGL_FATAL,
@@ -385,7 +385,7 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl)
     }
       
     if (!get_data (s, data, packet_len)) {
-      printf ("media data read failed\n");
+      mp_msg(MSGT_NETWORK,MSGL_ERR,"media data read failed\n");
       return 0;
     }
 
@@ -397,7 +397,7 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl)
     int command;
 
     if (!get_data (s, (char*)&packet_len, 4)) {
-      printf ("packet_len read failed\n");
+      mp_msg(MSGT_NETWORK,MSGL_ERR,"packet_len read failed\n");
       return 0;
     }
 
@@ -410,25 +410,25 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl)
     }
 
     if (!get_data (s, data, packet_len)) {
-      printf ("command data read failed\n");
+      mp_msg(MSGT_NETWORK,MSGL_ERR,"command data read failed\n");
       return 0;
     }
 
     if ( (pre_header[7] != 0xb0) || (pre_header[6] != 0x0b)
 	 || (pre_header[5] != 0xfa) || (pre_header[4] != 0xce) ) {
 
-      printf ("missing signature\n");
+      mp_msg(MSGT_NETWORK,MSGL_ERR,"missing signature\n");
       return -1;
     }
 
     command = get_32 (data, 24) & 0xFFFF;
 
-//    printf ("\ncommand packet detected, len=%d  cmd=0x%X\n", packet_len, command);
+//    mp_msg(MSGT_NETWORK,MSGL_INFO,"\ncommand packet detected, len=%d  cmd=0x%X\n", packet_len, command);
 
     if (command == 0x1b) 
       send_command (s, 0x1b, 0, 0, 0, data);
     else if (command == 0x1e) {
-      printf ("everything done. Thank you for downloading a media file containing proprietary and patentend technology.\n");
+      mp_msg(MSGT_NETWORK,MSGL_INFO,"everything done. Thank you for downloading a media file containing proprietary and patentend technology.\n");
       return 0;
     }
     else if (command == 0x21 ) {
@@ -437,12 +437,12 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl)
 	return 0;
     }
     else if (command != 0x05) {
-      printf ("unknown command %02x\n", command);
+      mp_msg(MSGT_NETWORK,MSGL_ERR,"unknown command %02x\n", command);
       return -1;
     }
   }
 
-//  printf ("get media packet succ\n");
+//  mp_msg(MSGT_NETWORK,MSGL_INFO,"get media packet succ\n");
 
   return 1;
 }
@@ -450,8 +450,7 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl)
 
 static int packet_length1;
 
-int
-asf_mmst_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) 
+static int asf_mmst_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) 
 {
   int len;
   
@@ -459,7 +458,7 @@ asf_mmst_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *strea
           // buffer is empty - fill it!
 	  int ret = get_media_packet( fd, packet_length1, stream_ctrl);
 	  if( ret<0 ) {
-		  printf("get_media_packet error : %s\n",strerror(errno));
+		  mp_msg(MSGT_NETWORK,MSGL_ERR,"get_media_packet error : %s\n",strerror(errno));
 		  return -1;
 	  } else if (ret==0) //EOF?
 		  return ret;
@@ -479,8 +478,7 @@ asf_mmst_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *strea
 
 }
 
-int
-asf_mmst_streaming_seek( int fd, off_t pos, streaming_ctrl_t *streaming_ctrl ) 
+static int asf_mmst_streaming_seek( int fd, off_t pos, streaming_ctrl_t *streaming_ctrl ) 
 {
 	return -1;
 	// Shut up gcc warning
@@ -528,7 +526,7 @@ int asf_mmst_streaming_start(stream_t *stream)
 	  free(path);
 	  return s;
   }
-  printf ("connected\n");
+  mp_msg(MSGT_NETWORK,MSGL_INFO,"connected\n");
   
   seq_num=0;
 
@@ -592,7 +590,7 @@ int asf_mmst_streaming_start(stream_t *stream)
   /* get_headers(s, asf_header);  */
 
   asf_header_len = get_header (s, asf_header, stream->streaming_ctrl);
-//  printf("---------------------------------- asf_header %d\n",asf_header);
+//  mp_msg(MSGT_NETWORK,MSGL_INFO,"---------------------------------- asf_header %d\n",asf_header);
   if (asf_header_len==0) return -1; //error reading header
   packet_length = interp_header (asf_header, asf_header_len);
 
@@ -642,7 +640,7 @@ int asf_mmst_streaming_start(stream_t *stream)
   stream->streaming_ctrl->status = streaming_playing_e;
 
   packet_length1 = packet_length;
-  printf("mmst packet_length = %d\n",packet_length);
+  mp_msg(MSGT_NETWORK,MSGL_INFO,"mmst packet_length = %d\n",packet_length);
 
 #ifdef USE_ICONV
   if (url_conv != (iconv_t)(-1))