Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > f9f7c393dc50916e62a25d128de509e1 > files > 2

cdp-0.33-27.mga5.src.rpm

--- cdp-0.33-13/getline.c	2011-10-13 12:11:47.992166260 +0000
+++ cdp-0.33-13/getline.c.orig	2011-10-13 12:11:43.136800770 +0000
@@ -139,7 +139,7 @@
 }
 			     
 
-int     getline( int      y,
+int     getlineCDP( int      y,
 		 int      x, 
 		 int      width,
  		 chtype   attrText,
--- cdp-0.33-13/display.c	2011-10-13 12:09:21.260680004 +0000
+++ cdp-0.33-13/display.c.orig	2011-10-13 12:08:41.550333481 +0000
@@ -540,7 +540,7 @@
     displayStatusPrintf( pInfo, pCD->trk[ track - 1 ].songname );
   
     line = TOC_TOP_LINE + 1 + track - 1 - pInfo->scrStartTrack;
-    code = getline( line, STARTX_TRK_NAME, WIDTH_TRK_NAME + 2,REVERSE_COLOR,
+    code = getlineCDP( line, STARTX_TRK_NAME, WIDTH_TRK_NAME + 2,REVERSE_COLOR,
 		    NORMAL_COLOR, MARKED_COLOR | A_BOLD, 
  		    lpszNewName, SONG_SIZE, 
 		    pCD->trk[ track - 1 ].songname );
@@ -573,7 +573,7 @@
     resetCurrTrackMark( pInfo );
     pCD = pInfo->pCD;
 
-    code = getline( 2, 19, WIDTH_CDNAME, REVERSE_COLOR,
+    code = getlineCDP( 2, 19, WIDTH_CDNAME, REVERSE_COLOR,
 		    NORMAL_COLOR, MARKED_COLOR | A_BOLD, 
 		    lpszNewName, sizeof( pCD->cdname ), 
 		    pCD->cdname );
@@ -604,7 +604,7 @@
     resetCurrTrackMark( pInfo );
     pCD = pInfo->pCD;
 
-    code = getline( 1, 19, WIDTH_ARTIST,REVERSE_COLOR,
+    code = getlineCDP( 1, 19, WIDTH_ARTIST,REVERSE_COLOR,
 		    NORMAL_COLOR, MARKED_COLOR | A_BOLD, 
 		    lpszNewName, sizeof( pCD->artist ), 
 		    pCD->artist );
--- cdp-0.33-13/getline.h	2011-10-13 12:08:09.025487670 +0000
+++ cdp-0.33-13/getline.h.orig	2011-10-13 12:17:16.951432249 +0000
@@ -7,7 +7,7 @@
 #define  __getline__H
 
 
-int     getline( int      y, 
+int     getlineCDP( int      y, 
 		 int      x,
 		 int      width,
  		 chtype   attrText,