rpms/grip/F-9 grip-3.2.0-executionpatch.patch, 1.1, 1.2 grip.spec, 1.22, 1.23

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/grip/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22897

Modified Files:
	grip-3.2.0-executionpatch.patch grip.spec 
Log Message:
* Sat Aug 23 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-22
- updated to better "execute command after encode" patch from Stefan Becker


grip-3.2.0-executionpatch.patch:

Index: grip-3.2.0-executionpatch.patch
===================================================================
RCS file: /cvs/extras/rpms/grip/F-9/grip-3.2.0-executionpatch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grip-3.2.0-executionpatch.patch	10 Aug 2008 16:25:29 -0000	1.1
+++ grip-3.2.0-executionpatch.patch	23 Aug 2008 22:44:50 -0000	1.2
@@ -1,97 +1,56 @@
-diff -ur grip-3.2.0.clean/src/grip.c grip-3.2.0/src/grip.c
---- grip-3.2.0.clean/src/grip.c	2004-04-15 20:23:54.000000000 +0200
-+++ grip-3.2.0/src/grip.c	2008-08-10 17:23:41.000000000 +0200
-@@ -129,7 +129,9 @@
+diff -up grip-3.2.0/src/grip.c.exec-after-encode grip-3.2.0/src/grip.c
+--- grip-3.2.0/src/grip.c.exec-after-encode	2008-08-11 11:56:07.000000000 +0300
++++ grip-3.2.0/src/grip.c	2008-08-11 11:56:07.000000000 +0300
+@@ -129,7 +129,8 @@ void DoSaveConfig(GripInfo *ginfo);
  {"vol_vis",CFG_ENTRY_BOOL,0,&uinfo->volvis},\
  {"track_edit_vis",CFG_ENTRY_BOOL,0,&uinfo->track_edit_visible},\
  {"track_prog_vis",CFG_ENTRY_BOOL,0,&uinfo->track_prog_visible},\
 -{"volume",CFG_ENTRY_INT,0,&ginfo->volume},
 +{"volume",CFG_ENTRY_INT,0,&ginfo->volume},\
-+{"execute_after_encode",CFG_ENTRY_STRING,265,ginfo->execute_after_encode},\
-+{"execute_after_encode_params",CFG_ENTRY_STRING,265,ginfo->execute_after_encode_params},
++{"execute_after_encode_cmd",CFG_ENTRY_STRING,256,ginfo->execute_after_encode_cmd},
  
  #define CDPAR_CFG_ENTRIES \
  {"disable_paranoia",CFG_ENTRY_BOOL,0,&ginfo->disable_paranoia},\
-diff -ur grip-3.2.0.clean/src/gripcfg.c grip-3.2.0/src/gripcfg.c
---- grip-3.2.0.clean/src/gripcfg.c	2004-04-15 20:20:15.000000000 +0200
-+++ grip-3.2.0/src/gripcfg.c	2008-08-10 17:23:41.000000000 +0200
-@@ -482,6 +482,18 @@
+diff -up grip-3.2.0/src/gripcfg.c.exec-after-encode grip-3.2.0/src/gripcfg.c
+--- grip-3.2.0/src/gripcfg.c.exec-after-encode	2008-08-11 11:56:07.000000000 +0300
++++ grip-3.2.0/src/gripcfg.c	2008-08-11 11:56:07.000000000 +0300
+@@ -475,6 +475,11 @@ void MakeConfigPage(GripInfo *ginfo)
  		     255,TRUE);
    gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
    gtk_widget_show(entry);
 +  
-+  entry=MakeStrEntry(NULL,ginfo->execute_after_encode,_("Execute command after encode"),
++  entry=MakeStrEntry(NULL,ginfo->execute_after_encode_cmd,_("Execute command after encode"),
 +		     255,TRUE);
 +  gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
 +  gtk_widget_show(entry);
-+
-+  entry=MakeStrEntry(NULL,ginfo->execute_after_encode_params,_("Execute command after encode params"),
-+		     255,TRUE);
-+  gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
-+  gtk_widget_show(entry);
-+
-+
  
    gtk_container_add(GTK_CONTAINER(page2),vbox);
    gtk_widget_show(vbox);
-diff -ur grip-3.2.0.clean/src/grip.h grip-3.2.0/src/grip.h
---- grip-3.2.0.clean/src/grip.h	2004-04-15 19:51:47.000000000 +0200
-+++ grip-3.2.0/src/grip.h	2008-08-10 17:23:41.000000000 +0200
-@@ -311,6 +311,8 @@
+diff -up grip-3.2.0/src/grip.h.exec-after-encode grip-3.2.0/src/grip.h
+--- grip-3.2.0/src/grip.h.exec-after-encode	2004-04-15 20:51:47.000000000 +0300
++++ grip-3.2.0/src/grip.h	2008-08-11 11:56:07.000000000 +0300
+@@ -311,6 +311,7 @@ typedef struct _grip_info {
    int edit_num_cpu;
    int mp3nice;
    char mp3_filter_cmd[256];
-+  char execute_after_encode[256];
-+  char execute_after_encode_params[256];
++  char execute_after_encode_cmd[256];
    gboolean doid3;
    gboolean doid3v2;
    gboolean tag_mp3_only;
-diff -ur grip-3.2.0.clean/src/rip.c grip-3.2.0/src/rip.c
---- grip-3.2.0.clean/src/rip.c	2004-04-15 20:21:15.000000000 +0200
-+++ grip-3.2.0/src/rip.c	2008-08-10 17:23:41.000000000 +0200
-@@ -362,6 +362,37 @@
-   }
- }
- 
-+static void ExecAfterRip(GripInfo *ginfo,EncodeTrack *enc_track)
-+{
-+  int execpid;
-+
-+  execpid=fork();
-+  
-+  if(execpid==0) {
-+    CloseStuff(ginfo);
-+    GString *args[100];
-+    char *char_args[101];
-+    int arg;
-+
-+    MakeTranslatedArgs(ginfo->execute_after_encode_params,args,100,TranslateSwitch,
-+		       enc_track,FALSE,&(ginfo->sprefs));
-+    ArgsToLocale(args);
-+
-+    for(arg=0;args[arg];arg++) {
-+      char_args[arg+1]=args[arg]->str;
-+    }
-+
-+    char_args[arg+1]=NULL;
-+
-+    char_args[0]=FindRoot(ginfo->execute_after_encode);
-+
-+    execv(ginfo->execute_after_encode,char_args);
-+
-+    LogStatus(ginfo,_("Exec failed\n"));
-+    _exit(0);
-+  }
-+}
-+
- static void AddSQLEntry(GripInfo *ginfo,EncodeTrack *enc_track)
- {
-   int sqlpid;
-@@ -999,6 +1030,7 @@
- 		   ginfo->encoded_track[mycpu]);
- 
- 	  if(ginfo->add_to_db) AddSQLEntry(ginfo,ginfo->encoded_track[mycpu]);
-+	  ExecAfterRip(ginfo,ginfo->encoded_track[mycpu]);
+diff -up grip-3.2.0/src/rip.c.exec-after-encode grip-3.2.0/src/rip.c
+--- grip-3.2.0/src/rip.c.exec-after-encode	2008-08-11 11:56:07.000000000 +0300
++++ grip-3.2.0/src/rip.c	2008-08-11 12:14:09.000000000 +0300
+@@ -1012,6 +1012,13 @@ void UpdateRipProgress(GripInfo *ginfo)
+ 	    else RipIsFinished(ginfo,FALSE);
+           }
  
- 	  if(*ginfo->mp3_filter_cmd)
- 	    TranslateAndLaunch(ginfo->mp3_filter_cmd,TranslateSwitch,
++	  /* Check if last encode finished */
++	  if(*ginfo->execute_after_encode_cmd&&!ginfo->rip_partial&&
++	     !ginfo->ripping&&!ginfo->encode_list)
++	    TranslateAndLaunch(ginfo->execute_after_encode_cmd,TranslateSwitch,
++			       ginfo->encoded_track[mycpu],FALSE,
++			       &(ginfo->sprefs),CloseStuff,(void *)ginfo);
++
+ 	  g_free(ginfo->encoded_track[mycpu]);
+          
+ 	  if(!ginfo->rip_partial&&ginfo->encode_list) {


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/F-9/grip.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- grip.spec	10 Aug 2008 16:25:29 -0000	1.22
+++ grip.spec	23 Aug 2008 22:44:50 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 21%{?dist}
+Release: 22%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: Applications/Multimedia
@@ -96,6 +96,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Aug 23 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-22
+- updated to better "execute command after encode" patch from Stefan Becker
+
 * Sun Aug 10 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-21
 - added "execute command after encode" patch (#457186)