For me:
bugfixes: both in the trunk and branches.
new features: only in the trunk.
What I really meant was, do we merge the bugfixes every time we commit them, or just merge when we increase the version number?
1/ Concerning the commits for the new features: maybe a review of the patch(es) by one or two developpers could be great before to commit it(them) to the trunk....to avoid random issues you know. ;) Aften patches mostly finished for my part...Good idea. How does it work with significantly larger patches, though? New functionality often introduces a number of new files, etc. Still post the patches here?
2/ I think (as a normal user, not a developper or something like that ;)) that the Profiles and the Codecs List must be renamed to be more clear. So, here is a proposition for the Audio Codecs:
AAC - FAAC
AAC - Nero Digital
AAC - Winamp
AC3 - Aften
AC3 - FFmpeg
MP2 - FFmpeg
MP3 - Aud-X
MP3 - Lame
OGG - Xiph
As you can see, the Format Type first followed by the name of the Encoder Engine and sorted in alphabetic order of course.
Here the patch:
Index: core/gui/Form1.cs
===================================================================
--- core/gui/Form1.cs (revision 358)
+++ core/gui/Form1.cs (working copy)
@@ -1778,14 +1778,14 @@
PackageSystem.VideoSettingsProviders.Register(new XviDSettingsProvider());
PackageSystem.VideoSettingsProviders.Register(new SnowSettingsProvider());
PackageSystem.VideoSettingsProviders.Register(new LavcSettingsProvider());
+ PackageSystem.AudioSettingsProviders.Register(new faacSettingsProvider());
PackageSystem.AudioSettingsProviders.Register(new NeroAACSettingsProvider());
- PackageSystem.AudioSettingsProviders.Register(new AudXSettingsProvider());
- PackageSystem.AudioSettingsProviders.Register(new faacSettingsProvider());
+ PackageSystem.AudioSettingsProviders.Register(new waacSettingsProvider());
PackageSystem.AudioSettingsProviders.Register(new ffac3SettingsProvider());
PackageSystem.AudioSettingsProviders.Register(new ffmp2SettingsProvider());
- PackageSystem.AudioSettingsProviders.Register(new lameSettingsProvider());
- PackageSystem.AudioSettingsProviders.Register(new vorbisSettingsProvider());
- PackageSystem.AudioSettingsProviders.Register(new waacSettingsProvider());
+ PackageSystem.AudioSettingsProviders.Register(new AudXSettingsProvider());
+ PackageSystem.AudioSettingsProviders.Register(new lameSettingsProvider());
+ PackageSystem.AudioSettingsProviders.Register(new vorbisSettingsProvider());
PackageSystem.MediaFileTypes.Register(new AvsFileFactory());
PackageSystem.MediaFileTypes.Register(new d2vFileFactory());
PackageSystem.MediaFileTypes.Register(new MediaInfoFileFactory());
Index: core/plugins/interfaces/ISettingsProvider.cs
===================================================================
--- core/plugins/interfaces/ISettingsProvider.cs (revision 358)
+++ core/plugins/interfaces/ISettingsProvider.cs (working copy)
@@ -400,7 +400,7 @@
NeroAACSettings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public NeroAACSettingsProvider()
- : base("ND AAC", AudioEncoderType.NAAC, AudioCodec.AAC)
+ : base("AAC - Nero Digital", AudioEncoderType.NAAC, AudioCodec.AAC)
{
}
}
@@ -408,49 +408,49 @@
AudXSettings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public AudXSettingsProvider()
- : base("Aud-X", AudioEncoderType.AUDX, AudioCodec.MP3)
+ : base("MP3 - Aud-X", AudioEncoderType.AUDX, AudioCodec.MP3)
{ }
}
public class faacSettingsProvider : SettingsProviderImpl2<faacConfigurationPanel, string[],
FaacSettings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public faacSettingsProvider()
- : base("FAAC", AudioEncoderType.FAAC, AudioCodec.AAC)
+ : base("AAC - FAAC", AudioEncoderType.FAAC, AudioCodec.AAC)
{ }
}
public class ffac3SettingsProvider : SettingsProviderImpl2<AC3ConfigurationPanel, string[],
AC3Settings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public ffac3SettingsProvider()
- : base("FFMPEG AC-3", AudioEncoderType.FFAC3, AudioCodec.AC3)
+ : base("AC3 - FFmpeg", AudioEncoderType.FFAC3, AudioCodec.AC3)
{ }
}
public class ffmp2SettingsProvider : SettingsProviderImpl2<MP2ConfigurationPanel, string[],
MP2Settings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public ffmp2SettingsProvider()
- : base("FFMPEG MP2", AudioEncoderType.FFMP2, AudioCodec.MP2)
+ : base("MP2 - FFmpeg", AudioEncoderType.FFMP2, AudioCodec.MP2)
{ }
}
public class lameSettingsProvider : SettingsProviderImpl2<lameConfigurationPanel, string[],
MP3Settings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public lameSettingsProvider()
- : base("LAME MP3", AudioEncoderType.LAME, AudioCodec.MP3)
+ : base("MP3 - Lame", AudioEncoderType.LAME, AudioCodec.MP3)
{ }
}
public class vorbisSettingsProvider : SettingsProviderImpl2<OggVorbisConfigurationPanel, string[],
OggVorbisSettings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public vorbisSettingsProvider()
- : base("Ogg Vorbis", AudioEncoderType.VORBIS, AudioCodec.VORBIS)
+ : base("OGG - Xiph", AudioEncoderType.VORBIS, AudioCodec.VORBIS)
{ }
}
public class waacSettingsProvider : SettingsProviderImpl2<WinAmpAACConfigurationPanel, string[],
WinAmpAACSettings, AudioCodecSettings, AudioCodec, AudioEncoderType>
{
public waacSettingsProvider()
- : base("Winamp AAC", AudioEncoderType.WAAC, AudioCodec.AAC)
+ : base("AAC - Winamp", AudioEncoderType.WAAC, AudioCodec.AAC)
{ }
}
Sounds fine. But it would be easier to sort alphabetically by setting the Sorted property of the codec combobox in the AudioEncodingTab to True.