[MPlayer-cvslog] r38464 - in trunk/gui: dialog/playlist.c dialog/preferences.c interface.c ui/actions.c ui/main.c

[ib]

Author: ib
Date: Sun Apr 21 12:51:56 2024
New Revision: 38464

Log:
Avoid "warning: this statement may fall through".

Modified:
   trunk/gui/dialog/playlist.c
   trunk/gui/dialog/preferences.c
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/main.c

Modified: trunk/gui/dialog/playlist.c
==============================================================================
--- trunk/gui/dialog/playlist.c	Sun Apr 21 12:50:05 2024	(r38463)
+++ trunk/gui/dialog/playlist.c	Sun Apr 21 12:51:56 2024	(r38464)
@@ -181,6 +181,8 @@ static void plButtonReleased( GtkButton
 
         listMgr(PLITEM_FREE, curr);
        }
+       // fall through
+
   case 0: // cancel
        NrOfSelected=NrOfEntrys=0;
        nfree( CLListSelected );

Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c	Sun Apr 21 12:50:05 2024	(r38463)
+++ trunk/gui/dialog/preferences.c	Sun Apr 21 12:51:56 2024	(r38464)
@@ -400,6 +400,7 @@ static void prButton( GtkButton * button
           gtkMessageBox( MSGBOX_INFORMATION,_(MSGTR_GUI_MSG_PlaybackNeedsRestart) );
           inform = False;
          }
+         // fall through
 
    case bCancel:
         gtk_widget_destroy( Preferences );
@@ -1257,6 +1258,8 @@ void ShowPreferences( void )
  switch ( frame_dropping )
   {
    case 2: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBHFramedrop ),TRUE );
+   // fall through
+
    case 1: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBFramedrop ),TRUE );
   }
 
@@ -1661,6 +1664,8 @@ static void audioButton(GtkButton *butto
         gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice));
       }
 #endif
+      // fall through
+
    case 0:
       gtk_widget_destroy(AudioConfig);
       break;
@@ -1848,6 +1853,8 @@ static void dxr3Button( GtkButton * butt
   case 0: // Ok
        nfree( gtkDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) );
        gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) );
+       // fall through
+
   case 1: // Cancel
        gtk_widget_destroy( DXR3Config );
        break;

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Apr 21 12:50:05 2024	(r38463)
+++ trunk/gui/interface.c	Sun Apr 21 12:51:56 2024	(r38464)
@@ -301,12 +301,13 @@ void guiInit(void)
 
             gtkMessageBox(MSGBOX_WARNING | MSGBOX_WAIT, _(MSGTR_GUI_MSG_NoSkinInstalled));
             setdup(&skinName, "");
-            break;
         }
+        break;
 
     case -2:
         gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_SkinCfgError), skinName);
         mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
+        break;
     }
 
     /* initialize windows */

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Sun Apr 21 12:50:05 2024	(r38463)
+++ trunk/gui/ui/actions.c	Sun Apr 21 12:51:56 2024	(r38464)
@@ -80,10 +80,14 @@ static void MediumPrepare(int type)
     case STREAMTYPE_TV:
     case STREAMTYPE_DVB:
         listMgr(PLAYLIST_DELETE, 0);
+        // fall through
+
     case STREAMTYPE_FILE:
     case STREAMTYPE_STREAM:
     case STREAMTYPE_PLAYLIST:
         guiInfo.Angles = 0;
+        // fall through
+
     case STREAMTYPE_BINCUE:
         guiInfo.AudioStreams = 0;
         guiInfo.Subtitles    = 0;
@@ -132,6 +136,7 @@ void uiEvent(int ev, float param)
 #ifdef CONFIG_CDDA
     case ivSetCDTrack:
         guiInfo.Track = iparam;
+        // fall through
 
     case evPlayCD:
         if (guiInfo.StreamType != STREAMTYPE_CDDA)
@@ -142,6 +147,7 @@ void uiEvent(int ev, float param)
 #ifdef CONFIG_VCD
     case ivSetVCDTrack:
         guiInfo.Track = iparam;
+        // fall through
 
     case evPlayVCD:
         if (guiInfo.StreamType != STREAMTYPE_VCD)
@@ -179,6 +185,7 @@ void uiEvent(int ev, float param)
         reset_stream_ids();
         if (guiInfo.StreamType != STREAMTYPE_DVD)
             guiInfo.Track = 0;
+        // fall through
 
     case ivPlayDVD:
         guiInfo.StreamType = STREAMTYPE_DVD;
@@ -217,6 +224,7 @@ play:
 
                 if (!guiInfo.Track)
                     guiInfo.Track = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1);
+                // fall through
 
             case STREAMTYPE_BINCUE:   // track 0 is OK and will auto-select first media data track
                 guiInfo.MediumChanged = GUI_MEDIUM_SAME;
@@ -242,6 +250,8 @@ play:
         uiLoadPlay = True;
 
 //      guiInfo.StreamType=STREAMTYPE_FILE;
+        // fall through
+
     case evLoad:
         gtkShow(evLoad, NULL);
         break;
@@ -432,6 +442,7 @@ play:
             break;
         } else if (!guiApp.videoWindow.isFullScreen)
             break;
+        // fall through
 
     case evFullScreen:
 

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Sun Apr 21 12:50:05 2024	(r38463)
+++ trunk/gui/ui/main.c	Sun Apr 21 12:51:56 2024	(r38464)
@@ -300,6 +300,8 @@ static void uiMainKey( int KeyCode,int T
               uiEvent( evNormalSize,0 );
               return;
              }
+             // fall through
+
       default:          vo_x11_putkey( Key ); return;
      }
    }