Mercurial > hg > xmms-sid

changeset 798:4c5b695fd85e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename variables.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 07 Nov 2012 11:24:29 +0200
parents 02512cbc6d9f
children 13483b855058
files src/xmms-sid.c src/xs_fileinfo.c src/xs_player.h
diffstat 3 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/xmms-sid.c	Wed Nov 07 11:21:44 2012 +0200
+++ b/src/xmms-sid.c	Wed Nov 07 11:24:29 2012 +0200
@@ -128,7 +128,7 @@
 
     /* Stop playing, if we are */
     XS_MUTEX_LOCK(xs_status);
-    if (xs_status.isPlaying)
+    if (xs_status.playing)
     {
         XS_MUTEX_UNLOCK(xs_status);
         xs_stop();
@@ -321,12 +321,12 @@
      */
     audioOpen = FALSE;
     doPlay = TRUE;
-    while (xs_status.isPlaying && doPlay)
+    while (xs_status.playing && doPlay)
     {
         /* Automatic sub-tune change logic */
         XS_MUTEX_LOCK(xs_cfg);
         XS_MUTEX_LOCK(xs_status);
-        myStatus.isPlaying = TRUE;
+        myStatus.playing = TRUE;
         
         if (xs_status.currSong < 1 || myStatus.currSong < 1)
         {
@@ -417,7 +417,7 @@
                 myStatus.audioChannels);
 
             XS_MUTEX_LOCK(xs_status);
-            xs_status.isError = TRUE;
+            xs_status.error = TRUE;
             XS_MUTEX_UNLOCK(xs_status);
             goto xs_err_exit;
         }
@@ -443,7 +443,7 @@
         /*
          * Play the subtune
          */
-        while (xs_status.isPlaying && myStatus.isPlaying && (xs_status.currSong == myStatus.currSong))
+        while (xs_status.playing && myStatus.playing && (xs_status.currSong == myStatus.currSong))
         {
             audioGot = myStatus.engine->plrFillBuffer(
                 &myStatus, audioBuffer, XS_AUDIOBUF_SIZE);
@@ -455,13 +455,13 @@
                 audioGot, audioBuffer);
 
             /* Wait a little */
-            while (xs_status.isPlaying &&
+            while (xs_status.playing &&
                 (xs_status.currSong == myStatus.currSong) &&
                 (xs_plugin_ip.output->buffer_free() < audioGot))
                 xmms_usleep(500);
 
             /* Output audio */
-            if (xs_status.isPlaying && xs_status.currSong == myStatus.currSong)
+            if (xs_status.playing && xs_status.currSong == myStatus.currSong)
                 xs_plugin_ip.output->write_audio(audioBuffer, audioGot);
 
             /* Check if we have played enough */
@@ -471,19 +471,19 @@
                 {
                     if (songLength < 0 &&
                         xs_plugin_ip.output->output_time() >= xs_cfg.playMaxTime * 1000)
-                        myStatus.isPlaying = FALSE;
+                        myStatus.playing = FALSE;
                 }
                 else
                 {
                     if (xs_plugin_ip.output->output_time() >= xs_cfg.playMaxTime * 1000)
-                        myStatus.isPlaying = FALSE;
+                        myStatus.playing = FALSE;
                 }
             }
 
             if (songLength >= 0)
             {
                 if (xs_plugin_ip.output->output_time() >= songLength * 1000)
-                    myStatus.isPlaying = FALSE;
+                    myStatus.playing = FALSE;
             }
         }
 
@@ -499,7 +499,7 @@
         }
 
         /* Now determine if we continue by selecting other subtune or something */
-        if (!myStatus.isPlaying && !xs_cfg.subAutoEnable)
+        if (!myStatus.playing && !xs_cfg.subAutoEnable)
             doPlay = FALSE;
     }
 
@@ -522,7 +522,7 @@
      * next entry in the playlist .. or whatever it wishes.
      */
     XS_MUTEX_LOCK(xs_status);
-    xs_status.isPlaying = FALSE;
+    xs_status.playing = FALSE;
     XS_MUTEX_UNLOCK(xs_status);
 
     /* Exit the playing thread */
@@ -559,8 +559,8 @@
     XSDEBUG("load ok\n");
 
     /* Set general status information */
-    xs_status.isPlaying = TRUE;
-    xs_status.isError = FALSE;
+    xs_status.playing = TRUE;
+    xs_status.error = FALSE;
     xs_status.currSong = xs_status.tuneInfo->startTune;
 
     /* Start the playing thread! */
@@ -599,10 +599,10 @@
 
     /* Lock xs_status and stop playing thread */
     XS_MUTEX_LOCK(xs_status);
-    if (xs_status.isPlaying)
+    if (xs_status.playing)
     {
         XSDEBUG("stopping...\n");
-        xs_status.isPlaying = FALSE;
+        xs_status.playing = FALSE;
         XS_MUTEX_UNLOCK(xs_status);
         XS_THREAD_JOIN(xs_decode_thread);
     }
@@ -655,7 +655,7 @@
     XS_MUTEX_LOCK(xs_status);
     XS_MUTEX_LOCK(xs_subctrl);
 
-    if (xs_status.tuneInfo && xs_status.isPlaying)
+    if (xs_status.tuneInfo && xs_status.playing)
     {
         n = (gint) GTK_ADJUSTMENT(xs_subctrl_adj)->value;
         if (n >= 1 && n <= xs_status.tuneInfo->nsubTunes)
@@ -671,7 +671,7 @@
 {
     XS_MUTEX_LOCK(xs_status);
 
-    if (xs_status.tuneInfo && xs_status.isPlaying)
+    if (xs_status.tuneInfo && xs_status.playing)
     {
         if (xs_status.currSong > 1)
             xs_status.currSong--;
@@ -687,7 +687,7 @@
 {
     XS_MUTEX_LOCK(xs_status);
 
-    if (xs_status.tuneInfo && xs_status.isPlaying)
+    if (xs_status.tuneInfo && xs_status.playing)
     {
         if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
             xs_status.currSong++;
@@ -709,7 +709,7 @@
     /* Check if control window exists, we are currently playing and have a tune */
     if (xs_subctrl)
     {
-        if (xs_status.tuneInfo && xs_status.isPlaying)
+        if (xs_status.tuneInfo && xs_status.playing)
         {
             tmpAdj = GTK_ADJUSTMENT(xs_subctrl_adj);
 
@@ -768,7 +768,7 @@
 
     XS_MUTEX_LOCK(xs_subctrl);
 
-    if (!xs_status.tuneInfo || !xs_status.isPlaying ||
+    if (!xs_status.tuneInfo || !xs_status.playing ||
         xs_subctrl || xs_status.tuneInfo->nsubTunes <= 1)
         goto out;
 
@@ -839,7 +839,7 @@
 void xs_seek(gint time)
 {
     XS_MUTEX_LOCK(xs_status);
-    if (!xs_status.tuneInfo || !xs_status.isPlaying)
+    if (!xs_status.tuneInfo || !xs_status.playing)
         goto out;
 
     switch (xs_cfg.subsongControl)
@@ -889,14 +889,14 @@
 
     /* If errorflag is set, return -2 to signal it to XMMS's idle callback */
     XS_MUTEX_LOCK(xs_status);
-    if (xs_status.isError)
+    if (xs_status.error)
     {
         err = -2;
         goto error;
     }
 
     /* If there is no tune or tune has ended, return -1 */
-    if (!xs_status.tuneInfo || !xs_status.isPlaying)
+    if (!xs_status.tuneInfo || !xs_status.playing)
     {
         err = -1;
         goto error;
--- a/src/xs_fileinfo.c	Wed Nov 07 11:21:44 2012 +0200
+++ b/src/xs_fileinfo.c	Wed Nov 07 11:24:29 2012 +0200
@@ -54,7 +54,7 @@
         gboolean isEnabled;
         GtkAdjustment *tmpAdj;
 
-        if (xs_status.tuneInfo && xs_status.isPlaying && (xs_status.tuneInfo->nsubTunes > 1)) {
+        if (xs_status.tuneInfo && xs_status.playing && (xs_status.tuneInfo->nsubTunes > 1)) {
             tmpAdj = gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")));
 
             tmpAdj->value = xs_status.currSong;
@@ -87,7 +87,7 @@
     XS_MUTEX_LOCK(xs_status);
     XS_MUTEX_LOCK(xs_fileinfowin);
 
-    if (xs_status.tuneInfo && xs_status.isPlaying) {
+    if (xs_status.tuneInfo && xs_status.playing) {
         n = (gint) gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")))->value;
         if ((n >= 1) && (n <= xs_status.tuneInfo->nsubTunes))
             xs_status.currSong = n;
--- a/src/xs_player.h	Wed Nov 07 11:21:44 2012 +0200
+++ b/src/xs_player.h	Wed Nov 07 11:24:29 2012 +0200
@@ -32,8 +32,8 @@
 
     void        *internal;         /* SID-emulation internal engine data */
     XSEngine    *engine;           /* Selected player engine */
-    gboolean    isError,
-                isPlaying;
+    gboolean    error,
+                playing;
     gint        currSong,          /* Current sub-tune */
                 lastTime;