File grip-flac-progress.patch of Package grip

Overview Repositories Revisions Requests Users Attributes Meta

File grip-flac-progress.patch of Package grip (Revision 98253ad96e755ec3bfcbc3e02fef58df)

Currently displaying revision 98253ad96e755ec3bfcbc3e02fef58df , Show latest

diff -up src/rip.c.orig-flac src/rip.c
--- src/rip.c.orig-flac	2005-06-25 20:00:55.000000000 +0200
+++ src/rip.c	2012-02-28 10:47:51.697877516 +0100
@@ -808,7 +808,7 @@ void UpdateRipProgress(GripInfo *ginfo)
     gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->ripprogbar),percent);
 
     now = time(NULL);
-    elapsed = (gfloat)now - (gfloat)ginfo->rip_started;
+    elapsed =         now -         ginfo->rip_started;
 
     /* 1x is 44100*2*2 = 176400 bytes/sec */
     if(elapsed < 0.1f) /* 1/10 sec. */
@@ -944,10 +944,16 @@ void UpdateRipProgress(GripInfo *ginfo)
 			      percent);
        
       now = time(NULL);
-      elapsed = (gfloat)now - (gfloat)ginfo->mp3_started[mycpu];
+      elapsed =         now -         ginfo->mp3_started[mycpu];
 
       if(elapsed < 0.1f) /* 1/10 sec. */
 	speed=0.0f;
+#define FLAC_BITRATE 980
+      // Quick fix until we can add per-encoder bitrates:
+      else if (!strcmp(ginfo->mp3extension, "flac")
+	        && ginfo->kbits_per_sec < FLAC_BITRATE)
+	speed=(gfloat)mystat.st_size/
+	  (FLAC_BITRATE * 128.0f * elapsed);
       else
 	speed=(gfloat)mystat.st_size/
 	  ((gfloat)ginfo->kbits_per_sec * 128.0f * elapsed);
@@ -1112,8 +1118,6 @@ char *TranslateSwitch(char switch_char,v
 {
   static char res[PATH_MAX];
   EncodeTrack *enc_track;
-  gchar *conv_str,*st;
-  gsize rb,wb;
 
   enc_track=(EncodeTrack *)data;
 
@@ -1736,6 +1740,13 @@ static gboolean MP3Encode(GripInfo *ginf
   
   unlink(ginfo->mp3file[cpu]);
   
+  // Quick fix until we can add per-encoder bitrates
+  if (!strcmp(ginfo->mp3extension, "flac")
+	 && ginfo->kbits_per_sec < FLAC_BITRATE)
+    ginfo->mp3size[cpu]=
+      (int)((gfloat)((enc_track->end_frame-enc_track->start_frame)+1)*
+	    (gfloat)(FLAC_BITRATE*1024)/600.0);
+  else
   ginfo->mp3size[cpu]=
     (int)((gfloat)((enc_track->end_frame-enc_track->start_frame)+1)*
 	  (gfloat)(ginfo->kbits_per_sec*1024)/600.0);
@@ -1839,6 +1850,13 @@ static size_t CalculateWavSize(GripInfo
 static size_t CalculateEncSize(GripInfo *ginfo, int track)
 {
   double tmp_encsize=0.0;
+  // Quick fix until we can add per-encoder bitrates:
+  if (!strcmp(ginfo->mp3extension, "flac")
+	 && ginfo->kbits_per_sec < FLAC_BITRATE)
+    tmp_encsize=(double)((ginfo->disc.track[track].length.mins*60+
+			  ginfo->disc.track[track].length.secs-2)*
+		         FLAC_BITRATE*1024/8);
+  else
   /* It's not the best way, but i couldn't find anything better */
   tmp_encsize=(double)((ginfo->disc.track[track].length.mins*60+
 			ginfo->disc.track[track].length.secs-2)*

Places

File grip-flac-progress.patch of Package grip (Revision 98253ad96e755ec3bfcbc3e02fef58df)

Places