Moved random,repeat notification to main.c

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@519 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/main.c b/main.c
index 0e36133295c2477b76cb52963c4dbba3aaa9d4d2..f4e0f1dfe2609b7db804b735d29ef1a30211690f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -105,6 +105,8 @@ main(int argc, const char *argv[])
   while( connected || options->reconnect )
     {
       command_t cmd;
+      static int repeat = -1;
+      static int random = -1;
 
       if( connected && counter==0  )
        {
@@ -119,10 +121,27 @@ main(int argc, const char *argv[])
          else
            mpd_finishCommand(mpc->connection);
          counter=10;
+
+         if( repeat<0 )
+           {
+             repeat = mpc->status->repeat;
+             random = mpc->status->random;
+           }
+         if( repeat != mpc->status->repeat )
+           screen_status_printf("Repeat is %s", 
+                                mpc->status->repeat  ? "On" : "Off");
+         if( random != mpc->status->random )
+           screen_status_printf("Random is %s", 
+                                mpc->status->random ? "On" : "Off");
+
+         repeat = mpc->status->repeat;
+         random = mpc->status->random;
        }
 
       if( connected )
        {
+         
+
          screen_update(mpc);
          if( (cmd=get_keyboard_command()) != CMD_NONE )
            {

diff --git a/screen.c b/screen.c
index 18feab9a0d9484d4fb4a3c2f8dd8c8c8d75e869a..17457843294f3ad6686f335b6c5d103fedb8a230 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -169,7 +169,6 @@ paint_status_window(mpd_client_t *c)
 
   if( (IS_PLAYING(status->state) || IS_PAUSED(status->state)) &&  song )
     {
-      // my_mvwaddstr(w, 0, x, mpc_get_song_name(song), COLOR_PAIR(2));
       mvwaddstr(w, 0, x, mpc_get_song_name(song));
     }
   
@@ -183,7 +182,6 @@ paint_status_window(mpd_client_t *c)
               " [%i:%02i/%i:%02i] ",
               status->elapsedTime/60, status->elapsedTime%60,
               status->totalTime/60,   status->totalTime%60 );
-      //my_mvwaddstr(w, 0, x, screen->buf, COLOR_PAIR(1));
       mvwaddstr(w, 0, x, screen->buf);
        
     }
@@ -505,13 +503,11 @@ screen_cmd(mpd_client_t *c, command_t cmd)
       n = !c->status->repeat;
       mpd_sendRepeatCommand(c->connection, n);
       mpd_finishCommand(c->connection);
-      screen_status_printf("Repeat is %s", n ? "On" : "Off");
       break;
     case CMD_RANDOM:
       n = !c->status->random;
       mpd_sendRandomCommand(c->connection, n);
       mpd_finishCommand(c->connection);
-      screen_status_printf("Random is %s", n ? "On" : "Off");
       break;
     case CMD_VOLUME_UP:
       if( c->status->volume!=MPD_STATUS_NO_VOLUME && c->status->volume<100 )