[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[13] mplayerxp

[<nic...@us...>]

Revision: 13
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=13&view=rev
Author:   nickols_k
Date:     2009-12-05 18:11:12 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
warning suppression

Modified Paths:
--------------
    mplayerxp/mp_msg.c
    mplayerxp/subreader.c
    mplayerxp/subreader.h

Modified: mplayerxp/mp_msg.c
===================================================================
--- mplayerxp/mp_msg.c	2009-12-05 18:09:50 UTC (rev 12)
+++ mplayerxp/mp_msg.c	2009-12-05 18:11:12 UTC (rev 13)
@@ -7,6 +7,7 @@
 #include <pthread.h>
 #include "config.h"
 #include "mp_msg.h"
+#include "nls/nls.h"
 
 #define _bg(x) ((x) >> 4)
 #define _fg(x) ((x) & 0x0f)

Modified: mplayerxp/subreader.c
===================================================================
--- mplayerxp/subreader.c	2009-12-05 18:09:50 UTC (rev 12)
+++ mplayerxp/subreader.c	2009-12-05 18:11:12 UTC (rev 13)
@@ -435,10 +435,10 @@
         if (!(sscanf (line, "-->> %ld", &(current->start)) <1))
 		break;
     }
-    
-    if (previous_aqt_sub != NULL) 
+
+    if (previous_aqt_sub != NULL)
 	previous_aqt_sub->end = current->start-1;
-    
+
     previous_aqt_sub = current;
 
     if (!fgets (line, LINE_LEN, fd))
@@ -454,7 +454,7 @@
     sub_readtext(line,&current->text[1]);
     current->lines = 2;
 
-    if ((current->text[0]=="") && (current->text[1]=="")) {
+    if (strcmp(current->text[0],"")==0 && strcmp(current->text[1],"")==0) {
 	// void subtitle -> end of previous marked and exit
 	previous_aqt_sub = NULL;
 	return NULL;

Modified: mplayerxp/subreader.h
===================================================================
--- mplayerxp/subreader.h	2009-12-05 18:09:50 UTC (rev 12)
+++ mplayerxp/subreader.h	2009-12-05 18:11:12 UTC (rev 13)
@@ -30,7 +30,7 @@
 
     unsigned long start;
     unsigned long end;
-    
+
     char *text[SUB_MAX_TEXT];
 } subtitle;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.