Bug#279224: Add encode configuration for AAC files

[Flavio Stanchina]

tags 279224 + patch
thanks

The attached patch adds an encode configuration for AAC files using faac;
it also adds a %N switch for the number of tracks, which closes #310176.

Sorry for not making it a dpatch patch, but I don't know how dpatch works
exactly and at this moment I'm a bit too tired to learn it. ;)

-- 
Ciao, Flavio


diff --git a/debian/changelog b/debian/changelog
index 59a4df0..7f9f1b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grip (3.3.1-9.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add encode configuration for AAC files (Closes: #279224).
+  * Add %N switch for the number of tracks (Closes: #310176).
+
+ -- Flavio Stanchina <[EMAIL PROTECTED]>  Thu, 28 Sep 2006 23:39:50 +0200
+
 grip (3.3.1-9) unstable; urgency=low
 
   * Downgrading depends on yelp to a recommends to allow skipping the long
diff --git a/doc/C/grip.xml b/doc/C/grip.xml
index acaaceb..e434e7e 100644
--- a/doc/C/grip.xml
+++ b/doc/C/grip.xml
@@ -1110,6 +1110,9 @@
             number,beginning at 1, and zero-filled (ie: '03' for the third
             track).  </para></listitem>
 
+        <listitem><para><guilabel>N</guilabel> &mdash; The number of
+            tracks, zero-filled (ie: '07'). </para></listitem>
+
         <listitem><para><guilabel>s</guilabel> &mdash; The start sector of
             the track.  </para></listitem>
 
diff --git a/src/gripcfg.c b/src/gripcfg.c
index 8f8ea75..e1aebb4 100644
--- a/src/gripcfg.c
+++ b/src/gripcfg.c
@@ -58,6 +58,9 @@ static MP3Encoder encoder_defaults[]={{"
                                       "-o %m -a %a -l %d -t %n -b %b -N %t -G 
%G -d %y %w",
                                       "ogg"},
                                      {"flac","-V -o %m %w","flac"},
+                                     {"faac",
+                                      "-b %b -o %m -w --artist %a --title %n 
--genre %G --album %d --track %t/%N --year %y %w",
+                                      "m4a"},
                                      {"other","",""},
                                      {"",""}
 };
diff --git a/src/rip.c b/src/rip.c
index 6cc58e4..d906da3 100644
--- a/src/rip.c
+++ b/src/rip.c
@@ -1147,6 +1172,10 @@ char *TranslateSwitch(char switch_char,v
     g_snprintf(res,PATH_MAX,"%02d",enc_track->track_num+1);
     *munge=FALSE;
     break;
+  case 'N':
+    g_snprintf(res,PATH_MAX,"%02d",enc_track->ginfo->prog_totaltracks);
+    *munge=FALSE;
+    break;
   case 's':
     g_snprintf(res,PATH_MAX,"%d",enc_track->ginfo->start_sector);
     *munge=FALSE;