X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Frip.c;h=3b555b47943f0172fde8598d6223d39833c54ea7;hb=5862f0a7518439cde4ba73f08baabd5a972c2873;hp=6cc58e49c25a04f738e4de2dfd4832482c982f6d;hpb=45c0e948e8b98c5034d1e76e32c549063d185811;p=hvgrip.git

diff --git a/src/rip.c b/src/rip.c
index 6cc58e4..3b555b4 100644
--- a/src/rip.c
+++ b/src/rip.c
@@ -64,7 +64,7 @@ static void DoWavFilter(GripInfo *ginfo);
 static void DoDiscFilter(GripInfo *ginfo);
 static void RipIsFinished(GripInfo *ginfo,gboolean aborted);
 static void CheckDupNames(GripInfo *ginfo);
-static void RipWholeCD(gint reply,gpointer data);
+static void RipWholeCD(gpointer data);
 static int NextTrackToRip(GripInfo *ginfo);
 static gboolean RipNextTrack(GripInfo *ginfo);
 #ifdef CDPAR
@@ -598,7 +598,7 @@ static gboolean AddM3U(GripInfo *ginfo)
 
   fp=fopen(conv_str, "w");
   if(fp==NULL) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Error: can't open m3u file."));
     return FALSE;
   }
@@ -1266,7 +1266,7 @@ void DoRip(GtkWidget *widget,gpointer data)
   ginfo=(GripInfo *)data;
 
   if(!ginfo->have_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("No disc was detected in the drive. If you have a disc in your drive, please check your CDRom device setting under Config->CD."));
     return;
   }
@@ -1275,7 +1275,7 @@ void DoRip(GtkWidget *widget,gpointer data)
   else ginfo->doencode=TRUE;
 
   if(!ginfo->using_builtin_cdp&&!FileExists(ginfo->ripexename)) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Invalid rip executable.\nCheck your rip config, and ensure it specifies the full path to the ripper executable."));
 
     ginfo->doencode=FALSE;
@@ -1283,7 +1283,7 @@ void DoRip(GtkWidget *widget,gpointer data)
   }
 
   if(ginfo->doencode&&!FileExists(ginfo->mp3exename)) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Invalid encoder executable.\nCheck your encoder config, and ensure it specifies the full path to the encoder executable."));
 
     ginfo->doencode=FALSE;
@@ -1318,8 +1318,7 @@ void DoRip(GtkWidget *widget,gpointer data)
   }
 
   if(NextTrackToRip(ginfo)==ginfo->disc.num_tracks) {
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)ginfo->gui_info.app,
+    DisplayOkCancelDialog(GTK_WINDOW(ginfo->gui_info.app),
        _("No tracks selected.\nRip whole CD?\n"),
        RipWholeCD,(gpointer)ginfo);
     return;
@@ -1336,13 +1335,11 @@ void DoRip(GtkWidget *widget,gpointer data)
   }
 }
 
-static void RipWholeCD(gint reply,gpointer data)
+static void RipWholeCD(gpointer data)
 {
   int track;
   GripInfo *ginfo;
 
-  if(reply) return;
-
   Debug(_("Ripping whole CD\n"));
 
   ginfo=(GripInfo *)data;
@@ -1445,7 +1442,7 @@ static gboolean RipNextTrack(GripInfo *ginfo)
 
     MakeDirs(ginfo->ripfile);
     if(!CanWrite(ginfo->ripfile)) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+      DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                         _("No write access to write wav file"));
       return FALSE;
     }
@@ -1489,7 +1486,7 @@ static gboolean RipNextTrack(GripInfo *ginfo)
     bytesleft=BytesLeftInFS(ginfo->ripfile);
 
     if(bytesleft<(ginfo->ripsize*1.5)) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+      DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                         _("Out of space in output directory"));
 
       return FALSE;
@@ -1715,7 +1712,7 @@ static gboolean MP3Encode(GripInfo *ginfo)
 
   MakeDirs(ginfo->mp3file[cpu]);
   if(!CanWrite(ginfo->mp3file[cpu])) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("No write access to write encoded file."));
     return FALSE;
   }
@@ -1741,7 +1738,7 @@ static gboolean MP3Encode(GripInfo *ginfo)
 	  (gfloat)(ginfo->kbits_per_sec*1024)/600.0);
   
   if(bytesleft<(ginfo->mp3size[cpu]*1.5)) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Out of space in output directory"));
     
     return FALSE;