[G15daemon-commits] SF.net SVN: g15daemon:[494] trunk/g15daemon-audio-plugins/ g15daemon_audacious/g15daemon_audacious_spectrum.c

[<rob...@us...>]

Revision: 494
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=494&view=rev
Author:   robynhub
Date:     2009-04-25 10:43:41 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
Right align text for title

Modified Paths:
--------------
    trunk/g15daemon-audio-plugins/g15daemon_audacious/g15daemon_audacious_spectrum.c

Modified: trunk/g15daemon-audio-plugins/g15daemon_audacious/g15daemon_audacious_spectrum.c
===================================================================
--- trunk/g15daemon-audio-plugins/g15daemon_audacious/g15daemon_audacious_spectrum.c	2009-04-25 06:48:21 UTC (rev 493)
+++ trunk/g15daemon-audio-plugins/g15daemon_audacious/g15daemon_audacious_spectrum.c	2009-04-25 10:43:41 UTC (rev 494)
@@ -81,15 +81,11 @@
    added to the neighbouring bars */
 #define dif 3 
 
-/* length of the row. */
-#define ROWLEN 34
+#define ROWLEN 35
 
 /* height of a char */
-#define CHAR_HEIGH 8
+#define CHAR_HEIGH 9
 
-/* witdh of a char (approx) */
-#define CHAR_WIDTH 5
-
 /* font size for title */
 #define FONT_SIZE 8
 
@@ -190,6 +186,7 @@
 static void g15analyser_conf_reset(void);
 
 g15canvas *canvas;
+g15font   *font;
 
 static unsigned int playing=0, paused=0;
 static int g15screen_fd = -1;
@@ -966,7 +963,7 @@
   char *title;
   char *strtok_ptr;
   /* total length of the string */
-  int rendstrlen = (ROWLEN * rownum);
+  int rendstrlen = (ROWLEN * rownum); 
   static int vol_timeout=0;
   long chksum=0;
   static long last_chksum;
@@ -1036,7 +1033,8 @@
 	      
 	      
 	      if (*pRendToken != '\0')
-		g15r_renderString (canvas, (unsigned char *)pRendToken, 0, FONT_SIZE, 0, NumRow * CHAR_HEIGH);
+		/* g15r_renderString (canvas, (unsigned char *)pRendToken, 0, FONT_SIZE, 0, NumRow * CHAR_HEIGH); */
+	      g15r_G15FPrint (canvas, pRendToken, 0, NumRow * CHAR_HEIGH, FONT_SIZE, 2,G15_COLOR_BLACK, 0);
 	    }
 	    
 	    pRendStr= &pRendStr[TokenEnd];
@@ -1048,17 +1046,17 @@
 	  }
 	} else{
 	  /* Only one line */
-	  int title_pixel = strlen(title) * CHAR_WIDTH;
+	  int title_pixel = g15r_testG15FontWidth(font,title);
 	  int i;
 	  // Substitution "_" with " "
 	  for (i = 0 ; i < strlen(title); i++){
 	    if (title[i] == '_')
 	      title[i] = ' ';
 	  }
-	  if (strlen(title) < ROWLEN){
+	  if (title_pixel <= G15_LCD_WIDTH){
 	    
-	    g15r_renderString (canvas, (unsigned char *)title, 0, FONT_SIZE, 0, 0);
-	    
+	    /* g15r_renderString (canvas, (unsigned char *)title, 0, FONT_SIZE, 0, 0); */
+	    g15r_G15FPrint (canvas, title, 0, 0, FONT_SIZE, 2,G15_COLOR_BLACK, 0);
 	  } else {
 	    /* title cycle :D */
 	    /* roll it over my soul... (Oasis) */
@@ -1074,8 +1072,8 @@
 	      text_start =  text_start2 - title_pixel - 25 % (title_pixel + G15_LCD_WIDTH);
 	      text_start2 = text_start2 % (title_pixel + G15_LCD_WIDTH);
 	    }
-	    g15r_renderString (canvas, (unsigned char *)title, 0, FONT_SIZE, 160 - text_start2, 0);
-	    g15r_renderString (canvas, (unsigned char *)title, 0, FONT_SIZE, 160 - text_start, 0);
+	    g15r_renderString (canvas, (unsigned char *)title, 0, FONT_SIZE, G15_LCD_WIDTH - text_start2, 0);
+	    g15r_renderString (canvas, (unsigned char *)title, 0, FONT_SIZE, G15_LCD_WIDTH - text_start, 0);
 	  }
 	}
       }
@@ -1184,11 +1182,13 @@
 	    }
 	}
       else 
-	g15r_renderString (canvas, (unsigned char *)"Playback Stopped", 0, 13, 21, 16);
+	/* g15r_renderString (canvas, (unsigned char *)"Playback Stopped", 0, 13, 21, 16); */
+	g15r_G15FPrint (canvas, "Playback Stopped", 21, 16, 13, 1, G15_COLOR_BLACK, 0);
       
     }
     else
-      g15r_renderString (canvas, (unsigned char *)"Playlist Empty", 0, 13, 34, 16);
+      /* g15r_renderString (canvas, (unsigned char *)"Playlist Empty", 0, 13, 34, 16); */
+      g15r_G15FPrint (canvas, "Playlist Empty", 34, 16, 13, 1, G15_COLOR_BLACK, 0);
     
     if(lastvolume!=get_main_volume() || vol_timeout>=0) {
       if(lastvolume!=get_main_volume())
@@ -1283,7 +1283,8 @@
 	canvas->mode_xor = 0;
       }
     
-    
+    /* requesting font size needed */ 
+    font = g15r_requestG15DefaultFont(FONT_SIZE);
     pthread_mutex_unlock(&g15buf_mutex);
     /* increase lcd drive voltage/contrast for this client */
     g15_send_cmd(g15screen_fd, G15DAEMON_CONTRAST,2);


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