Mercurial > mplayer.hg

changeset 29170:9d40283d9a5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unify error message output and update error messages. patch by Adrian Stutz, adrian sttz ch
author diego
date Mon, 20 Apr 2009 18:20:37 +0000
parents 5c48a1cdd1d7
children 091f16266a60
files libvo/vo_macosx.m
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_macosx.m	Mon Apr 20 15:35:34 2009 +0000
+++ b/libvo/vo_macosx.m	Mon Apr 20 18:20:37 2009 +0000
@@ -127,7 +127,7 @@
 	}
 	else
 	{
-		mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d does not exist, falling back to main device.\n", screen_id);
+		mp_msg(MSGT_VO, MSGL_INFO, "[vo_macosx] Device ID %d does not exist, falling back to main device\n", screen_id);
 		screen_handle = [screen_array objectAtIndex:0];
 		screen_id = -1;
 	}
@@ -178,8 +178,8 @@
 	}
 	else
 	{
-		mp_msg(MSGT_VO, MSGL_INFO, "VO: [macosx] writing output to a shared buffer "
-				"named \"%s\".\n",buffer_name);
+		mp_msg(MSGT_VO, MSGL_INFO, "[vo_macosx] writing output to a shared buffer "
+				"named \"%s\"\n",buffer_name);
 		
 		movie_aspect = (float)d_width/(float)d_height;
 		
@@ -188,7 +188,7 @@
 		if (shm_fd == -1)
 		{
 			mp_msg(MSGT_VO, MSGL_FATAL, 
-				   "vo_macosx: failed to open shared memory. Error: %s\n", strerror(errno));
+				   "[vo_macosx] failed to open shared memory. Error: %s\n", strerror(errno));
 			return 1;
 		}
 		
@@ -196,7 +196,7 @@
 		if (ftruncate(shm_fd, image_width*image_height*image_bytes) == -1)
 		{
 			mp_msg(MSGT_VO, MSGL_FATAL, 
-				   "vo_macosx: failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno));
+				   "[vo_macosx] failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno));
 			shm_unlink(buffer_name);
 			return 1;
 		}
@@ -207,7 +207,7 @@
 		if (image_data == MAP_FAILED)
 		{
 			mp_msg(MSGT_VO, MSGL_FATAL, 
-				   "vo_macosx: failed to map shared memory. Error: %s\n", strerror(errno));
+				   "[vo_macosx] failed to map shared memory. Error: %s\n", strerror(errno));
 			shm_unlink(buffer_name);
 			return 1;
 		}		
@@ -303,10 +303,10 @@
 		mplayerosxProxy = nil;
 		
 		if (munmap(image_data, image_width*image_height*image_bytes) == -1)
-			mp_msg(MSGT_VO, MSGL_FATAL, "uninit: munmap failed. Error: %s\n", strerror(errno));
+			mp_msg(MSGT_VO, MSGL_FATAL, "[vo_macosx] uninit: munmap failed. Error: %s\n", strerror(errno));
 		
 		if (shm_unlink(buffer_name) == -1)
-			mp_msg(MSGT_VO, MSGL_FATAL, "uninit: shm_unlink failed. Error: %s\n", strerror(errno));
+			mp_msg(MSGT_VO, MSGL_FATAL, "[vo_macosx] uninit: shm_unlink failed. Error: %s\n", strerror(errno));
 		
 	}
 
@@ -477,20 +477,20 @@
 	
 	error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[0], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[0]);
 	if(error != kCVReturnSuccess)
-		mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Buffer(%d)\n", error);
+		mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create Pixel Buffer(%d)\n", error);
 	if (vo_doublebuffering) {
 		error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[1], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[1]);
 		if(error != kCVReturnSuccess)
-			mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Double Buffer(%d)\n", error);
+			mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create Pixel Double Buffer(%d)\n", error);
 	}
 	
 	error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache);
 	if(error != kCVReturnSuccess)
-		mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture Cache(%d)\n", error);
+		mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create OpenGL texture Cache(%d)\n", error);
 	
 	error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture);
 	if(error != kCVReturnSuccess)
-		mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error);
+		mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create OpenGL texture(%d)\n", error);
 	
 	//show window
 	[window center];
@@ -838,7 +838,7 @@
 	CVOpenGLTextureRelease(texture);
 	error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture);
 	if(error != kCVReturnSuccess)
-		mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error);
+		mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create OpenGL texture(%d)\n", error);
 
     CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft);
 }