[svn] / branches / release-1_3-branch / xvidcore / dshow / src / config.c Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/dshow/src/config.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/xvidcore/dshow/src/config.c revision 1912, Sat Dec 18 10:17:35 2010 UTC branches/release-1_3-branch/xvidcore/dshow/src/config.c revision 1995, Wed May 18 16:13:23 2011 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Configuration processing -   *  - Configuration processing -
5   *   *
6   *  Copyright(C) 2002-2004 Peter Ross <pross@xvid.org>   *  Copyright(C) 2002-2011 Peter Ross <pross@xvid.org>
7   *   *
8   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
9   *  it under the terms of the GNU General Public License as published by   *  it under the terms of the GNU General Public License as published by
# Line 19  Line 19 
19   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   * $Id: config.c,v 1.11 2010-12-18 10:16:46 Isibaar Exp $   * $Id$
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
26  #include <windows.h>  #include <windows.h>
27  #include <commctrl.h>  #include <commctrl.h>
28    #include <xvid.h>
29  #include "config.h"  #include "config.h"
30  #include "debug.h"  #include "debug.h"
31  #include "resource.h"  #include "resource.h"
# Line 55  Line 56 
56          REG_GET_N("Videoinfo_Compat",  g_config.videoinfo_compat, 0)          REG_GET_N("Videoinfo_Compat",  g_config.videoinfo_compat, 0)
57          REG_GET_N("Decoder_Aspect_Ratio",  g_config.aspect_ratio, 0)          REG_GET_N("Decoder_Aspect_Ratio",  g_config.aspect_ratio, 0)
58          REG_GET_N("num_threads",  g_config.num_threads, 0)          REG_GET_N("num_threads",  g_config.num_threads, 0)
59            REG_GET_N("cpu_flags", g_config.cpu, 0)
60    
61          RegCloseKey(hKey);          RegCloseKey(hKey);
62  }  }
# Line 90  Line 92 
92          REG_SET_N("Supported_4CC",  g_config.supported_4cc);          REG_SET_N("Supported_4CC",  g_config.supported_4cc);
93          REG_SET_N("Videoinfo_Compat",  g_config.videoinfo_compat);          REG_SET_N("Videoinfo_Compat",  g_config.videoinfo_compat);
94          REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);          REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);
95            REG_SET_N("num_threads",  g_config.num_threads);
96    
97          RegCloseKey(hKey);          RegCloseKey(hKey);
98  }  }
# Line 125  Line 128 
128                  break;                  break;
129    
130          case WM_INITDIALOG:          case WM_INITDIALOG:
131                    {
132                            xvid_gbl_info_t info;
133                            char core[100];
134                            HINSTANCE m_hdll;
135    
136                            memset(&info, 0, sizeof(info));
137                            info.version = XVID_VERSION;
138    
139                            m_hdll = LoadLibrary(XVID_DLL_NAME);
140                            if (m_hdll != NULL) {
141    
142                                    ((int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_global"))
143                                            (0, XVID_GBL_INFO, &info, NULL);
144    
145                                    wsprintf(core, "Xvid MPEG-4 Video Codec v%d.%d.%d",
146                                            XVID_VERSION_MAJOR(info.actual_version),
147                                            XVID_VERSION_MINOR(info.actual_version),
148                                            XVID_VERSION_PATCH(info.actual_version));
149    
150                                    FreeLibrary(m_hdll);
151                            } else {
152                                    wsprintf(core, "xvidcore.dll not found!");
153                            }
154    
155                            SetDlgItemText(hwnd, IDC_CORE, core);
156                    }
157    
158                  // Load Force Colorspace Box                  // Load Force Colorspace Box
159                  SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_ADDSTRING, 0, (LPARAM)"No Force");                  SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_ADDSTRING, 0, (LPARAM)"No Force");
# Line 142  Line 171 
171                  SendMessage(hBrightness, TBM_SETPOS, (WPARAM)TRUE, (LPARAM) g_config.nBrightness);                  SendMessage(hBrightness, TBM_SETPOS, (WPARAM)TRUE, (LPARAM) g_config.nBrightness);
172    
173                  // Load Aspect Ratio Box                  // Load Aspect Ratio Box
174                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (mpeg-4 first)");                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (MPEG-4 first)");
175                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (external first)");                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (external first)");
176                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"4:3");                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"4:3");
177                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"16:9");                  SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"16:9");
# Line 162  Line 191 
191    
192                  // 4CC checkbuttons                  // 4CC checkbuttons
193                  SendMessage(GetDlgItem(hwnd, IDC_DIVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DIVX, 0);                  SendMessage(GetDlgItem(hwnd, IDC_DIVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DIVX, 0);
194                  SendMessage(GetDlgItem(hwnd, IDC_DX50), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DX50, 0);                  SendMessage(GetDlgItem(hwnd, IDC_3IVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_3IVX, 0);
195                  SendMessage(GetDlgItem(hwnd, IDC_MP4V), BM_SETCHECK, g_config.supported_4cc & SUPPORT_MP4V, 0);                  SendMessage(GetDlgItem(hwnd, IDC_MP4V), BM_SETCHECK, g_config.supported_4cc & SUPPORT_MP4V, 0);
196                  SendMessage(GetDlgItem(hwnd, IDC_COMPAT), BM_SETCHECK, g_config.videoinfo_compat, 0);                  SendMessage(GetDlgItem(hwnd, IDC_COMPAT), BM_SETCHECK, g_config.videoinfo_compat, 0);
197    
# Line 215  Line 244 
244                  case IDC_DIVX:                  case IDC_DIVX:
245                          g_config.supported_4cc ^= SUPPORT_DIVX;                          g_config.supported_4cc ^= SUPPORT_DIVX;
246                          break;                          break;
247                  case IDC_DX50:                  case IDC_3IVX:
248                          g_config.supported_4cc ^= SUPPORT_DX50;                          g_config.supported_4cc ^= SUPPORT_3IVX;
249                          break;                          break;
250                  case IDC_MP4V:                  case IDC_MP4V:
251                          g_config.supported_4cc ^= SUPPORT_MP4V;                          g_config.supported_4cc ^= SUPPORT_MP4V;

Legend:
Removed from v.1912  
changed lines
  Added in v.1995

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4