Changeset 831

Timestamp:

2003-03-17 02:24:46 (6 years ago)

Author:

robert

Message:

Fixed a series of ogg/vorbis write tags bugs

Files:

• mb_tagger/trunk/main.dfm (modified) (5 diffs)
• mb_tagger/trunk/preferences.cpp (modified) (3 diffs)
• mb_tagger/trunk/preferences.h (modified) (1 diff)
• mb_tagger/trunk/utf8.c (modified) (4 diffs)
• mb_tagger/trunk/vcedit.c (modified) (13 diffs)
• mb_tagger/trunk/vorbis.cpp (modified) (2 diffs)

mb_tagger/trunk/main.dfm

@@ -5 +5 @@
-  AutoScroll = False
-  Caption = 'MusicBrainz Tagger'
-50
+39
-  ClientWidth = 792
-  Color = clBtnFace
@@ -151 +151 @@
-  object statusBar: TStatusBar
-    Left = 0
-31
+20
-    Width = 792
-    Height = 19
@@ -997 +997 @@
-    Top = 215
-    Width = 792
-16
+05
-    Align = alClient
-    Caption = 'rightPanel'
@@ -1006 +1006 @@
-      Top = 1
-      Width = 790
-14
+03
-      TabStop = True
-      Align = alClient
@@ -1014 +1014 @@
-      OnDocumentComplete = webBrowserDocumentComplete
-      ControlData = {
-2035
+FD33
-        000000004C000000000000000000000001000000E0D057007335CF11AE690800
-        2B2E126200000000000000004C0000000114020000000000C000000000000046

mb_tagger/trunk/preferences.cpp

@@ -164 +164 @@
-   }
-
+   prefs.proxyServer = AnsiString("");
-   INTERNET_PROXY_INFO *info = (INTERNET_PROXY_INFO *)new char[size];
-   if (InternetQueryOption(NULL, INTERNET_OPTION_PROXY, info, &size))
@@ -174 +175 @@
-       }
-   }
+#if 0
+   if (prefs.proxyServer.IsEmpty())
+   {
+       AnsiString autoProxy;
+
+       if (getAutoProxy(autoProxy))
+       {
+           char temp[128];
+           sscanf(info->lpszProxy, "%[^:]:%d", temp, &prefs.proxyPort);
+           prefs.proxyServer = AnsiString(temp);
+       }
+   }
+#endif
+
-   delete [] info;
-
@@ -223 +238 @@
-}
-
+#if 0
+typedef bool (WINAPI *pfnGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD);
+typedef bool (WINAPI *pfnInitializeAutoProxyDll)(DWORD);
+typedef bool (WINAPI *pfnDeInitializeAutoProxyDll)(LPSTR, DWORD);
+
+bool __fastcall Preferences::getAutoProxy(AnsiString &proxyString)
+{
+   HMODULE hModJS;                               // Handle for loading the DLL
+   pfnGetProxyInfo pIGPI;                // Function-pointer instance
+   pfnDeInitializeAutoProxyDll pIIDAPD;  // Function-pointer instance
+   pfnInitializeAutoProxyDll   pIIIAPD;
+   unsigned long  proxyLen = 0;
+   char          *proxy = NULL;
+   const char    *url = "http://musicbrainz.org/index.html";
+   const char    *hostName = "musicbrainz.org";
+   bool           ret = false;
+
+   proxyString = "";
+
+   hModJS = LoadLibrary( "jsproxy.dll" );
+   if (!hModJS)
+       return false;
+
+   pIGPI = (pfnGetProxyInfo)GetProcAddress( hModJS, "InternetGetProxyInfo");
+   if (!pIGPI)
+       return false;
+
+   pIIIAPD= (pfnInitializeAutoProxyDll)
+                GetProcAddress( hModJS, "InternetInitializeAutoProxyDll" );
+   if (!pIIIAPD)
+       return false;
+
+   pIIDAPD = (pfnDeInitializeAutoProxyDll)
+                GetProcAddress(hModJS, "InternetDeInitializeAutoProxyDll");
+   if (!pIIDAPD)
+       return false;
+
+   // Initialize the M$ crap
+   pIIIAPD(0);
+
+   if (pIGPI(url, strlen(url), (char *)hostName, strlen(hostName), &proxy, &proxyLen))
+   {
+       proxyString = AnsiString(proxy);
+       ret = true;
+   }
+
+   // Shut it down; good riddance
+   pIIDAPD( NULL, 0 );
+
+   return ret;
+}
+#endif

mb_tagger/trunk/preferences.h

@@ -66 +66 @@
-        PreferenceValues prefs;
-
+        //bool __fastcall getAutoProxy(AnsiString &proxyString);
-};
-

mb_tagger/trunk/utf8.c

@@ -138 +138 @@
-
-    if(wchars == 0)
-    {
-        fprintf(stderr, "Unicode translation error %d\n", GetLastError());
-        return -1;
-    }
-
-    unicode = calloc(wchars + 1, sizeof(unsigned short));
-
-
-
+
-        return -1;
-
-
-
+
+
-            strlen(from), unicode, wchars);
-    if(err != wchars)
-    {
-        free(unicode);
-        fprintf(stderr, "Unicode translation error %d\n", GetLastError());
-        return -1;
-    }
@@ -178 +171 @@
-    unicode = make_unicode_string(from);
-    if(unicode == NULL) 
-    {
-        fprintf(stderr, "Out of memory processing string from UTF8 to UNICODE16\n");
-        return -1;
-    }
-
-    chars = WideCharToMultiByte(GetConsoleCP(), WC_COMPOSITECHECK, unicode,
@@ -194 +184 @@
-
-    *to = calloc(chars + 1, sizeof(unsigned char));
- 
+
-    {
-        fprintf(stderr, "Out of memory processing string to local charset\n");
@@ -201 +191 @@
-    }
-
- 
+
-            -1, *to, chars, NULL, NULL);
-    if(err != chars)

mb_tagger/trunk/vcedit.c

@@ -43 +43 @@
-static void vcedit_clear_internals(vcedit_state *state)
-{
+    char *tmp;
-    if(state->vc)
-    {
@@ -69 +70 @@
-    }
-
+    tmp = state->lasterror;
-    memset(state, 0, sizeof(*state));
+    state->lasterror = tmp;
-}
-
@@ -98 +101 @@
-    oggpack_writeinit(&opb);
-
-  
+
-    oggpack_write(&opb,0x03,8);
-    _v_writestring(&opb,"vorbis", 6);
@@ -113 +116 @@
-            if(vc->user_comments[i]){
-                oggpack_write(&opb,vc->comment_lengths[i],32);
- 
+
-                        vc->comment_lengths[i]);
-            }else{
@@ -197 +200 @@
-    char *buffer;
-    int bytes,i;
+    int chunks = 0;
-    ogg_packet *header;
-    ogg_packet  header_main;
@@ -210 +214 @@
-    ogg_sync_init(state->oy);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    state->serial = ogg_page_serialno(&og);
@@ -343 +353 @@
-    ogg_stream_init(&streamout, state->serial);
-
+    memset(&header_comments, 0, sizeof(header_comments));
-    _commentheader_out(state->vc, state->vendor, &header_comments);
-
@@ -354 +365 @@
-                (size_t) ogout.header_len)
-            goto cleanup;
- 
+
-                (size_t) ogout.body_len)
-            goto cleanup;
@@ -369 +380 @@
-            if(ogg_stream_flush(&streamout, &ogout))
-            {
- 
+
-                            out) != (size_t) ogout.header_len)
-                    goto cleanup;
@@ -384 +395 @@
-                            out) != (size_t) ogout.header_len)
-                    goto cleanup;
- 
+
-                            out) != (size_t) ogout.body_len)
-                    goto cleanup;
@@ -411 +422 @@
-                needout=1;
-            }
-      
+
-    }
-
@@ -453 +464 @@
-                if(state->write(ogout.header,1,ogout.header_len, 
-                        out) != (size_t) ogout.header_len) {
-                    fprintf(stderr, "Bumming out\n");
-                    goto cleanup;
-                }
-                if(state->write(ogout.body,1,ogout.body_len, out) !=
-                        (size_t) ogout.body_len) {
-                    fprintf(stderr, "Bumming out 2\n");
-                    goto cleanup;
-                }
@@ -472 +481 @@
-        }
-    }
-
+
-
-cleanup:
+
-    ogg_stream_clear(&streamout);
+    if (header_comments.packet)
+    {
+        _ogg_free(header_comments.packet);
+        header_comments.packet = NULL;
+    }
-    ogg_packet_clear(&header_comments);
-

mb_tagger/trunk/vorbis.cpp

@@ -92 +92 @@
-        key = entry.substr(0, sep);
-
-utf8_decode (entry.substr(sep+1, string::npos).c_str(), &decoded)
-val = decoded;
-if (decoded)
-{
-free (decoded);
-decoded = NULL
+decoded = NULL
+if (utf8_decode (entry.substr(sep+1, string::npos).c_str(), &decoded) == 0)
+{
+    val = decoded;
+if (decoded)
+    free (decoded)
-        }
-
-        transform(key.begin(),key.end(),key.begin(),(int(*)(int))&tolower);
-        map.insert (pair<string,string>(key, val));
-//        cerr << "found " << key << " with " << val << endl;
-    }
-}
@@ -123 +122 @@
-        transform(key.begin(),key.end(),key.begin(),(int(*)(int))&toupper);
-
-
-
-
+
+
+
+
+
+
+
-        
-        vorbis_comment_add (vc, (char*)comment.c_str());