[xiph-cvs] cvs commit: win32-tools/oggdrop Script.rc encthread.c main.c resource.h

Jack Moffitt jack at xiph.org
Sun Aug 12 13:18:03 PDT 2001



jack        01/08/12 13:18:03

  Modified:    oggdrop  Script.rc encthread.c main.c resource.h
  Log:
  New modes added to oggdrop

Revision  Changes    Path
1.4       +4 -1      win32-tools/oggdrop/Script.rc

Index: Script.rc
===================================================================
RCS file: /usr/local/cvsroot/win32-tools/oggdrop/Script.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Script.rc	2001/08/12 20:08:38	1.3
+++ Script.rc	2001/08/12 20:18:02	1.4
@@ -76,7 +76,10 @@
     BEGIN
         POPUP "Bitrate"
         BEGIN
-            MENUITEM "128 kbps",                    IDM_BITRATE128, CHECKED
+            MENUITEM "64 kbps",                     IDM_BITRATE64
+            MENUITEM "80 kbps",                     IDM_BITRATE80, CHECKED
+            MENUITEM "96 kbps",                     IDM_BITRATE96
+            MENUITEM "128 kbps",                    IDM_BITRATE128
             MENUITEM "160 kbps",                    IDM_BITRATE160
             MENUITEM "192 kbps",                    IDM_BITRATE192
             MENUITEM "256 kbps",                    IDM_BITRATE256

1.4       +1 -1      win32-tools/oggdrop/encthread.c

Index: encthread.c
===================================================================
RCS file: /usr/local/cvsroot/win32-tools/oggdrop/encthread.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- encthread.c	2001/08/12 20:08:38	1.3
+++ encthread.c	2001/08/12 20:18:02	1.4
@@ -17,7 +17,7 @@
 enclist_t *head = NULL;
 
 oe_options opt = {NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, 
-		0, 0, NULL,NULL, 128}; /* Default values */
+		0, 0, NULL,NULL, 64}; /* Default values */
 
 /* Define supported formats here */
 input_format formats[] = {

1.4       +51 -0     win32-tools/oggdrop/main.c

Index: main.c
===================================================================
RCS file: /usr/local/cvsroot/win32-tools/oggdrop/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- main.c	2001/08/12 20:08:38	1.3
+++ main.c	2001/08/12 20:18:02	1.4
@@ -253,7 +253,46 @@
                         }
                         break;
 
+		case IDM_BITRATE64:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_CHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE128, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE160, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE192, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE256, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE350, MF_UNCHECKED);
+			encthread_setbitrate(64);
+			break;
+
+		case IDM_BITRATE80:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_CHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE128, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE160, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE192, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE256, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE350, MF_UNCHECKED);
+			encthread_setbitrate(80);
+			break;
+
+		case IDM_BITRATE96:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_CHECKED);
+			CheckMenuItem(menu, IDM_BITRATE128, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE160, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE192, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE256, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE350, MF_UNCHECKED);
+			encthread_setbitrate(96);
+			break;
+
                 case IDM_BITRATE128:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE128, MF_CHECKED);
                         CheckMenuItem(menu, IDM_BITRATE160, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE192, MF_UNCHECKED);
@@ -263,6 +302,9 @@
                         break;
 
                 case IDM_BITRATE160:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE128, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE160, MF_CHECKED);
                         CheckMenuItem(menu, IDM_BITRATE192, MF_UNCHECKED);
@@ -272,6 +314,9 @@
                         break;
 
                 case IDM_BITRATE192:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE128, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE160, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE192, MF_CHECKED);
@@ -281,6 +326,9 @@
                         break;
                         
                 case IDM_BITRATE256:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE128, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE160, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE192, MF_UNCHECKED);
@@ -290,6 +338,9 @@
                         break;
 
                 case IDM_BITRATE350:
+			CheckMenuItem(menu, IDM_BITRATE64, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE80, MF_UNCHECKED);
+			CheckMenuItem(menu, IDM_BITRATE96, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE128, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE160, MF_UNCHECKED);
                         CheckMenuItem(menu, IDM_BITRATE192, MF_UNCHECKED);

1.4       +5 -2      win32-tools/oggdrop/resource.h

Index: resource.h
===================================================================
RCS file: /usr/local/cvsroot/win32-tools/oggdrop/resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- resource.h	2001/08/12 20:08:38	1.3
+++ resource.h	2001/08/12 20:18:02	1.4
@@ -23,7 +23,10 @@
 #define IDM_BITRATE350                  40009
 #define IDM_BITRATE192                  40010
 #define IDM_BITRATE160                  40011
-#define IDM_LOGERR                      40012
+#define IDM_BITRATE64					40012
+#define IDM_BITRATE80					40013
+#define IDM_BITRATE96					40014
+#define IDM_LOGERR                      40015
 
 // Next default values for new objects
 // 
@@ -31,7 +34,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        132
-#define _APS_NEXT_COMMAND_VALUE         40013
+#define _APS_NEXT_COMMAND_VALUE         40016
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list