less, and more informal printfs

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

5 files changed, 17 insertions, 11 deletions

diff --git a/loader/driver.c b/loader/driver.c
index ebb071802a..6133409680 100644
--- a/loader/driver.c
+++ b/loader/driver.c
@@ -174,7 +174,7 @@ DrvOpen(LPARAM lParam2)
             GUID* id=&CLSID_Voxware;
             
             result=func(id, &IID_IClassFactory, (void**)&factory);
-            if(result || (!factory)) printf("No such class object\n");
+            if(result || (!factory)) printf("No such class object (wrong/missing GUID?)\n");
 
             printf("Calling factory->vt->CreateInstance()\n");
             printf("addr = %X\n",(unsigned int)factory->vt->CreateInstance);
@@ -221,7 +221,7 @@ DrvOpen(LPARAM lParam2)
          hDriver = (HDRVR) 0;
      }
      
-     printf("Successfully loaded codec %s\n",win32_codec_name);
+//     printf("Successfully loaded codec %s\n",win32_codec_name);
      
      return (hDriver);
 }
diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c
index 02a5832e33..483c3a539a 100644
--- a/loader/dshow/DS_Filter.c
+++ b/loader/dshow/DS_Filter.c
@@ -54,13 +54,13 @@ void DS_Filter::Create(string dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM
 
              setup_FS_Segment();
 
-            printf("Calling factory->vt->CreateInstance()\n");
+//            printf("Calling factory->vt->CreateInstance()\n");
             result=factory->vt->CreateInstance(factory, 0, &IID_IUnknown, (void**)&object);
-            printf("Calling factory->vt->Release()\n");
+//            printf("Calling factory->vt->Release()\n");
 	
 //	result=factory->vt->CreateInstance(factory, 0, &IID_IUnknown, (void**)&object);
 
-        printf("CreateInstance ok %x\n",result);
+//        printf("CreateInstance ok %x\n",result);
 
 	factory->vt->Release((IUnknown*)factory);
 	if(result || (!object)) throw FATAL("Class factory failure");
@@ -77,7 +77,7 @@ void DS_Filter::Create(string dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM
 	ULONG fetched;
 	enum_pins->vt->Reset(enum_pins);
 	result=enum_pins->vt->Next(enum_pins, (ULONG)256, (IPin**)array, &fetched);
-	printf("Pins enumeration returned %d pins, error is %x\n", fetched, result);
+//	printf("Pins enumeration returned %d pins, error is %x\n", fetched, result);
 	
 	for(int i=0; i<fetched; i++)
 	{
diff --git a/loader/registry.c b/loader/registry.c
index 3b90e98a2d..c9b0f11676 100644
--- a/loader/registry.c
+++ b/loader/registry.c
@@ -265,7 +265,9 @@ struct reg_value* insert_reg_value(int handle, const char* name, int type, const
 
 static void init_registry()
 {
+#ifdef DETAILED_OUT
 	printf("Initializing registry\n");
+#endif
 	open_registry();
 	insert_handle(HKEY_LOCAL_MACHINE, "HKLM");
 	insert_handle(HKEY_CURRENT_USER, "HKCU");
diff --git a/loader/setup_FS.c b/loader/setup_FS.c
index 84581f2aed..78ff50248d 100644
--- a/loader/setup_FS.c
+++ b/loader/setup_FS.c
@@ -56,11 +56,15 @@ struct modify_ldt_ldt_s {
 
 void setup_FS_Segment()
 {
+#ifdef DETAILED_OUT
     printf("Setup FS...");fflush(stdout);
+#endif
     __asm__ __volatile__(
 	"movl %0,%%eax; movw %%ax, %%fs" : : "i" (TEB_SEL)
     );
+#ifdef DETAILED_OUT
     printf("OK!\n");
+#endif
 }
 
 
diff --git a/loader/win32.c b/loader/win32.c
index 66007b7dec..3d960e0109 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -1577,7 +1577,6 @@ int WINAPI expLoadLibraryA(char* name)
 {
     char qq[256];
     int result;
-    printf("They want library [%s] %s\n", def_path, name);
     if(strncmp(name, "c:\\windows\\", 11)==0)name+=11;
     if(name[0]!='/')
     {
@@ -1588,9 +1587,10 @@ int WINAPI expLoadLibraryA(char* name)
 	else
 	    strcat(qq, name);
     }
-    printf("Entering LoadLibraryA(%s)\n", name);
+    printf("Loading DLL: %s\n", qq);
+//    printf("Entering LoadLibraryA(%s)\n", name);
     result=LoadLibraryA(qq);
-    printf("Returned LoadLibraryA(0x%x='%s'), def_path=%s => 0x%x\n", name, name, def_path, result);
+//    printf("Returned LoadLibraryA(0x%x='%s'), def_path=%s => 0x%x\n", name, name, def_path, result);
     return result;
 }      
 int WINAPI expFreeLibrary(int module)
@@ -2345,8 +2345,8 @@ WIN_BOOL
                              LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count )
 {
  
- printf("RegEnumValueA(%x,%ld,%p,%p,%p,%p,%p,%p)\n",
-   hkey, index, value, val_count, reserved, type, data, count );
+// printf("RegEnumValueA(%x,%ld,%p,%p,%p,%p,%p,%p)\n",
+//   hkey, index, value, val_count, reserved, type, data, count );
 
  return -1;
 }