fix up GValueEnum

Original commit message from CVS:
fix up GValueEnum

diff --git a/ChangeLog b/ChangeLog
index 91afe5a5ddf77e10b139ea70b29a1830eca43235..9d35c02f27bd67ca074ff679272b0531734b5827 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * ext/lame/gstlame.c:
+       * ext/mad/gstmad.c:
+       * ext/sidplay/gstsiddec.cc:
+         fix up GValueEnum
+
 2005-11-22  Andy Wingo  <wingo@pobox.com>
 
        * Update for gst_tag_setter API changes.

diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index aa9a4b0ab28fb7cd2b6154f1b7ba56b1ecfcb6ba..d7e083f97a2fef951e6dda8b208efc49a91a74a4 100644 (file)
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -73,11 +73,11 @@ gst_lame_mode_get_type (void)
 {
   static GType lame_mode_type = 0;
   static GEnumValue lame_modes[] = {
-    {0, "0", "Stereo"},
-    {1, "1", "Joint-Stereo"},
-    {2, "2", "Dual channel"},
-    {3, "3", "Mono"},
-    {4, "4", "Auto"},
+    {0, "Stereo", "stereo"},
+    {1, "Joint Stereo", "joint"},
+    {2, "Dual Channel", "dual"},
+    {3, "Mono", "mono"},
+    {4, "Auto", "auto"},
     {0, NULL, NULL}
   };
 
@@ -93,16 +93,16 @@ gst_lame_quality_get_type (void)
 {
   static GType lame_quality_type = 0;
   static GEnumValue lame_quality[] = {
-    {0, "0", "0 - Best"},
+    {0, "0 - Best", 0},
     {1, "1", "1"},
     {2, "2", "2"},
     {3, "3", "3"},
     {4, "4", "4"},
-    {5, "5", "5 - Default"},
+    {5, "5 - Default", 5},
     {6, "6", "6"},
     {7, "7", "7"},
     {8, "8", "8"},
-    {9, "9", "9 - Worst"},
+    {9, "9 - Worst", 9},
     {0, NULL, NULL}
   };
 
@@ -118,9 +118,9 @@ gst_lame_padding_get_type (void)
 {
   static GType lame_padding_type = 0;
   static GEnumValue lame_padding[] = {
-    {0, "0", "No Padding"},
-    {1, "1", "Always Pad"},
-    {2, "2", "Adjust Padding"},
+    {0, "No Padding", "never"},
+    {1, "Always Pad", "always"},
+    {2, "Adjust Padding", "adjust"},
     {0, NULL, NULL}
   };
 
@@ -136,10 +136,10 @@ gst_lame_vbrmode_get_type (void)
 {
   static GType lame_vbrmode_type = 0;
   static GEnumValue lame_vbrmode[] = {
-    {vbr_off, "cbr", "No VBR (Constant Bitrate)"},
-    {vbr_rh, "old", "Lame's old VBR algorithm"},
-    {vbr_abr, "abr", "VBR Average Bitrate"},
-    {vbr_mtrh, "new", "Lame's new VBR algorithm"},
+    {vbr_off, "No VBR (Constant Bitrate)", "none"},
+    {vbr_rh, "Lame's old VBR algorithm", "old"},
+    {vbr_abr, "VBR Average Bitrate", "abr"},
+    {vbr_mtrh, "Lame's new VBR algorithm", "new"},
     {0, NULL, NULL}
   };
 
@@ -157,11 +157,11 @@ gst_lame_preset_get_type (void)
 {
   static GType gst_lame_preset = 0;
   static GEnumValue gst_lame_presets[] = {
-    {0, "none", "None"},
-    {MEDIUM, "medium", "Medium"},
-    {STANDARD, "standard", "Standard"},
-    {EXTREME, "extreme", "Extreme"},
-    {INSANE, "insane", "Insane"},
+    {0, "None", "none"},
+    {MEDIUM, "Medium", "medium"},
+    {STANDARD, "Standard", "standard"},
+    {EXTREME, "Extreme", "extreme"},
+    {INSANE, "Insane", "insane"},
     {0, NULL, NULL}
   };
 

diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 5a9ab7d2a8df2e2071fcfe2918ab2ec85cbf4136..4ff9e51f0437a0f05369327958b4da356370da2a 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -212,10 +212,10 @@ gst_mad_layer_get_type (void)
 {
   static GType mad_layer_type = 0;
   static GEnumValue mad_layer[] = {
-    {0, "0", "Unknown"},
-    {MAD_LAYER_I, "1", "I"},
-    {MAD_LAYER_II, "2", "II"},
-    {MAD_LAYER_III, "3", "III"},
+    {0, "Unknown", "unknown"},
+    {MAD_LAYER_I, "Layer I", "1"},
+    {MAD_LAYER_II, "Layer II", "2"},
+    {MAD_LAYER_III, "Layer III", "3"},
     {0, NULL, NULL},
   };
 
@@ -231,11 +231,11 @@ gst_mad_mode_get_type (void)
 {
   static GType mad_mode_type = 0;
   static GEnumValue mad_mode[] = {
-    {-1, "-1", "Unknown"},
-    {MAD_MODE_SINGLE_CHANNEL, "0", "Single Channel"},
-    {MAD_MODE_DUAL_CHANNEL, "1", "Dual Channel"},
-    {MAD_MODE_JOINT_STEREO, "2", "Joint Stereo"},
-    {MAD_MODE_STEREO, "3", "Stereo"},
+    {-1, "Unknown", "unknown"},
+    {MAD_MODE_MONO, "Mono", "mono"},
+    {MAD_MODE_DUAL_CHANNEL, "Dual Channel", "dual"},
+    {MAD_MODE_JOINT_STEREO, "Joint Stereo", "joint"},
+    {MAD_MODE_STEREO, "Stereo", "stereo"},
     {0, NULL, NULL},
   };
 
@@ -251,11 +251,11 @@ gst_mad_emphasis_get_type (void)
 {
   static GType mad_emphasis_type = 0;
   static GEnumValue mad_emphasis[] = {
-    {-1, "-1", "Unknown"},
-    {MAD_EMPHASIS_NONE, "0", "None"},
-    {MAD_EMPHASIS_50_15_US, "1", "50/15 Microseconds"},
-    {MAD_EMPHASIS_CCITT_J_17, "2", "CCITT J.17"},
-    {MAD_EMPHASIS_RESERVED, "3", "Reserved"},
+    {-1, "Unknown", "unknown"},
+    {MAD_EMPHASIS_NONE, "None", "none"},
+    {MAD_EMPHASIS_50_15_US, "50/15 Microseconds", "50-15"},
+    {MAD_EMPHASIS_CCITT_J_17, "CCITT J.17", "j-17"},
+    {MAD_EMPHASIS_RESERVED, "Reserved", "reserved"},
     {0, NULL, NULL},
   };
 

diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index 69c44fdd5f8a8d2ce7e65ebd88b1444778344eb3..9d4205dc4aeda57d0e8bca915d9a124eb581cf6e 100644 (file)
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -72,8 +72,8 @@ gst_sid_clock_get_type (void)
 {
   static GType sid_clock_type = 0;
   static GEnumValue sid_clock[] = {
-    {SIDTUNE_CLOCK_PAL, "0", "PAL"},
-    {SIDTUNE_CLOCK_NTSC, "1", "NTSC"},
+    {SIDTUNE_CLOCK_PAL, "PAL", "pal"},
+    {SIDTUNE_CLOCK_NTSC, "NTSC", "ntsc"},
     {0, NULL, NULL},
   };
 
@@ -89,9 +89,9 @@ gst_sid_memory_get_type (void)
 {
   static GType sid_memory_type = 0;
   static GEnumValue sid_memory[] = {
-    {MPU_BANK_SWITCHING, "32", "Bank Switching"},
-    {MPU_TRANSPARENT_ROM, "33", "Transparent ROM"},
-    {MPU_PLAYSID_ENVIRONMENT, "34", "Playsid Environment"},
+    {MPU_BANK_SWITCHING, "Bank Switching", "bank-switching"},
+    {MPU_TRANSPARENT_ROM, "Transparent ROM", "transparent-rom"},
+    {MPU_PLAYSID_ENVIRONMENT, "Playsid Environment", "playsid-environment"},
     {0, NULL, NULL},
   };