mpg/mpeg and m4r import

I've made a few changes (bottom of e-mail) to Audacity locally which
work fine for me, as per recent discussions on this subject. So I'd like
to commit these if no objections (or unless I missed something). These
mean:

* Mpeg/Mpg Videos containing PCM audio will now import via FFmpeg 
   using the  "all files" and "all supported files" filters, instead of
   just hanging. Importing mpg/mpeg in builds where USE_FFMPEG 
   is undefined will now produce an error suggesting the audio should
   be extracted from the video. The only "loss" in these builds is that
   you can't now import mpg/mpeg video with mpeg type audio, but 
   that's of little use IMO as the audio is extremely noisy with frequent
   heavy clicks.

* M4r ringtones can now be imported in FFmpeg builds without having 
   to use the "all files filter" to find them and acknowledge an importing 
   error.  From what research I've done, most m4r will be unencrypted,
   as the ones from iTunes store will still be called m4p, and I guess
   iPhones will make m4r more ubiquitous. In non FFmpeg builds, users
   will now get the more helpful "AAC" importing error instead of the
   (useless) suggestion they import raw.  

Tested in both FFmpeg and non-FFmpeg builds. I guess I could actually 
add AVI so that throws a more relevant error as well? 

Gale 

Import.cpp: 

239 becomes:
    if ((extension.IsSameAs(wxT("aac"), false))||(extension.IsSameAs(wxT("m4a"),
false))||(extension.IsSameAs(wxT("m4r"), false))||(extension.IsSameAs(wxT("mp4"), false))) {

    was---
   if ((extension.IsSameAs(wxT("aac"), false))||(extension.IsSameAs(wxT("m4a"),
false))||(extension.IsSameAs(wxT("mp4"), false))) {

292 onwards has added:
   // Mpeg movie files
   if ((extension.IsSameAs(wxT("mpg"), false))||(extension.IsSameAs(wxT("mpeg"), false))) {
      errorMessage.Printf(_("\"%s\" is an Mpeg video file. \nAudacity cannot currently open this type of
file. \nYou need to extract the audio to a supported format, such as WAV or AIFF."), fName.c_str());
      return 0;
   }

ImportFFmpeg.cpp:

added at 91:
   wxT("m4r"),

ImportMP3.cpp: 

removed lines 53,4:
   wxT("mpg"),
   wxT("mpeg"),

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/