[MPlayer-cvslog] r38515 - in trunk/gui: dialog/preferences.c interface.c

[ib]

Author: ib
Date: Sun May 12 19:49:19 2024
New Revision: 38515

Log:
Move the VideoOutError notification.

Show it on the Video driver page of the preferences
and make it a normal message box.

Modified:
   trunk/gui/dialog/preferences.c
   trunk/gui/interface.c

Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c	Sun May 12 19:46:54 2024	(r38514)
+++ trunk/gui/dialog/preferences.c	Sun May 12 19:49:19 2024	(r38515)
@@ -223,6 +223,14 @@ static gboolean prHScaler( GtkWidget * w
 static void prToggled( GtkToggleButton * togglebutton,gpointer user_data );
 static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data );
 
+static void notebook_switch_page (GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data)
+{
+  (void) notebook;
+  (void) page;
+
+  if (page_num == 1 && ((GtkCList *) user_data)->rows == 0) gtkMessageBox(MSGBOX_FATAL, _(MSGTR_GUI_MSG_VideoOutError));
+}
+
 #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
 static void prEntry( GtkEditable * editable,gpointer user_data )
 {
@@ -1147,6 +1155,8 @@ static GtkWidget * CreatePreferences( vo
 
   g_signal_connect( G_OBJECT( Preferences ),"destroy",G_CALLBACK( gtk_widget_destroyed ),&Preferences );
 
+  g_signal_connect(G_OBJECT(notebook1), "switch-page", G_CALLBACK(notebook_switch_page), CLVDrivers);
+
   g_signal_connect( G_OBJECT( AConfig ),"clicked",G_CALLBACK( prButton ),GINT_TO_POINTER(bAConfig) );
   g_signal_connect( G_OBJECT( BOk ),"clicked",G_CALLBACK( prButton ),GINT_TO_POINTER(bOk) );
   g_signal_connect( G_OBJECT( BCancel ),"clicked",G_CALLBACK( prButton ),GINT_TO_POINTER(bCancel) );

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun May 12 19:46:54 2024	(r38514)
+++ trunk/gui/interface.c	Sun May 12 19:49:19 2024	(r38515)
@@ -643,11 +643,6 @@ int gui(int what, void *data)
 
         /* video opts */
 
-        if (0) {
-            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_VideoOutError));
-            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
-        }
-
         {
             int i = 0;