--- a/src/xmms-sid.c	Wed Apr 09 10:37:42 2008 +0300
+++ b/src/xmms-sid.c	Mon Apr 21 18:41:01 2008 +0300
@@ -128,8 +128,8 @@
  */
 void xs_reinit(void)
 {
-    gint iPlayer;
-    gboolean isInitialized;
+    gint player;
+    gboolean initialized;
 
     /* Stop playing, if we are */
     XS_MUTEX_LOCK(xs_status);
@@ -167,31 +167,31 @@
     /* Try to initialize emulator engine */
     XSDEBUG("initializing emulator engine #%i...\n", xs_cfg.playerEngine);
 
-    iPlayer = 0;
-    isInitialized = FALSE;
-    while ((iPlayer < xs_nplayerlist) && !isInitialized) {
-        if (xs_playerlist[iPlayer].plrIdent == xs_cfg.playerEngine) {
-            if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
-                isInitialized = TRUE;
-                xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[iPlayer];
+    player = 0;
+    initialized = FALSE;
+    while ((player < xs_nplayerlist) && !initialized) {
+        if (xs_playerlist[player].plrIdent == xs_cfg.playerEngine) {
+            if (xs_playerlist[player].plrInit(&xs_status)) {
+                initialized = TRUE;
+                xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[player];
             }
         }
-        iPlayer++;
+        player++;
     }
 
-    XSDEBUG("init#1: %s, %i\n", (isInitialized) ? "OK" : "FAILED", iPlayer);
+    XSDEBUG("init#1: %s, %i\n", (initialized) ? "OK" : "FAILED", player);
 
-    iPlayer = 0;
-    while ((iPlayer < xs_nplayerlist) && !isInitialized) {
-        if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
-            isInitialized = TRUE;
-            xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[iPlayer];
-            xs_cfg.playerEngine = xs_playerlist[iPlayer].plrIdent;
+    player = 0;
+    while ((player < xs_nplayerlist) && !initialized) {
+        if (xs_playerlist[player].plrInit(&xs_status)) {
+            initialized = TRUE;
+            xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[player];
+            xs_cfg.playerEngine = xs_playerlist[player].plrIdent;
         } else
-            iPlayer++;
+            player++;
     }
 
-    XSDEBUG("init#2: %s, %i\n", (isInitialized) ? "OK" : "FAILED", iPlayer);
+    XSDEBUG("init#2: %s, %i\n", (initialized) ? "OK" : "FAILED", player);
 
 
     /* Get settings back, in case the chosen emulator backend changed them */
@@ -840,13 +840,13 @@
 /*
  * Set the time-seek position
  * The playing thread will do the "seeking", which means sub-tune
- * changing in XMMS-SID's case. iTime argument is time in seconds,
+ * changing in XMMS-SID's case. time argument is time in seconds,
  * in contrast to milliseconds used in other occasions.
  *
  * This function is called whenever position slider is clicked or
  * other method of seeking is used (keyboard, etc.)
  */
-void xs_seek(gint iTime)
+void xs_seek(gint time)
 {
     /* Check status */
     XS_MUTEX_LOCK(xs_status);
@@ -858,10 +858,10 @@
     /* Act according to settings */
     switch (xs_cfg.subsongControl) {
     case XS_SSC_SEEK:
-        if (iTime < xs_status.lastTime) {
+        if (time < xs_status.lastTime) {
             if (xs_status.currSong > 1)
                 xs_status.currSong--;
-        } else if (iTime > xs_status.lastTime) {
+        } else if (time > xs_status.lastTime) {
             if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
                 xs_status.currSong++;
         }
@@ -874,8 +874,8 @@
         /* If we have song-position patch, check settings */
 #ifdef HAVE_SONG_POSITION
     case XS_SSC_PATCH:
-        if ((iTime > 0) && (iTime <= xs_status.tuneInfo->nsubTunes))
-            xs_status.currSong = iTime;
+        if ((time > 0) && (time <= xs_status.tuneInfo->nsubTunes))
+            xs_status.currSong = time;
         break;
 #endif
     }
@@ -938,24 +938,24 @@
  */
 void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)
 {
-    xs_tuneinfo_t *pInfo;
+    xs_tuneinfo_t *info;
     
     XS_MUTEX_LOCK(xs_status);
 
     /* Get tune information from emulation engine */
-    pInfo = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
-    if (!pInfo) {
+    info = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
+    if (!info) {
         XS_MUTEX_UNLOCK(xs_status);
         return;
     }
 
     /* Get sub-tune information, if available */
-    if ((pInfo->startTune > 0) && (pInfo->startTune <= pInfo->nsubTunes)) {
+    if ((info->startTune > 0) && (info->startTune <= info->nsubTunes)) {
         gint tmpInt;
         
-        (*songTitle) = xs_make_titlestring(pInfo, pInfo->startTune);
+        (*songTitle) = xs_make_titlestring(info, info->startTune);
 
-        tmpInt = pInfo->subTunes[pInfo->startTune-1].tuneLength;
+        tmpInt = info->subTunes[info->startTune-1].tuneLength;
         if (tmpInt < 0)
             (*songLength) = -1;
         else
@@ -963,7 +963,7 @@
     }
 
     /* Free tune information */
-    xs_tuneinfo_free(pInfo);
+    xs_tuneinfo_free(info);
     XS_MUTEX_UNLOCK(xs_status);
 }