rtoss - Diff between revs 181 and 182

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 181 Rev 182
Line 112... Line 112...
112         // it also mustn't be a Winamp window (Winamp v1.x). 112         // it also mustn't be a Winamp window (Winamp v1.x).
113         GetClassName(hForegroundWnd, strName.GetBuffer(80), 80); 113         GetClassName(hForegroundWnd, strName.GetBuffer(80), 80);
114         strName.ReleaseBuffer(); 114         strName.ReleaseBuffer();
115 115
116         // patch from Darren Owen (problems with command line option "/class") 116         // patch from Darren Owen (problems with command line option "/class")
117         if((strName != "Winamp PE") && (strName != "Winamp v1.x")) -  
118                 if(FindWindowEx(hForegroundWnd,0,"WinampVis",0)) -  
-   117         if((strName != _T("Winamp PE")) && (strName != _T("Winamp v1.x")))
-   118                 if(FindWindowEx(hForegroundWnd,0,_T("WinampVis"),0))
119                         return; 119                         return;
120         // patch end 120         // patch end
121 121
122         nStyle = GetWindowLong(hForegroundWnd, GWL_STYLE); 122         nStyle = GetWindowLong(hForegroundWnd, GWL_STYLE);
123         nExStyle = GetWindowLong(hForegroundWnd, GWL_EXSTYLE); 123         nExStyle = GetWindowLong(hForegroundWnd, GWL_EXSTYLE);
124 124
125         if ((nStyle & WS_CAPTION) == WS_CAPTION && !(nExStyle & WS_EX_TOOLWINDOW) && (strName != "#32770") && -  
126                 (strName != "Shell_TrayWnd") && (strName != "Winamp v1.x") && (strName != "Winamp EQ") && -  
127                 (strName != "Winamp PE") && (strName =! "Winamp MB")) -  
-   125         if ((nStyle & WS_CAPTION) == WS_CAPTION && !(nExStyle & WS_EX_TOOLWINDOW) && (strName != _T("#32770")) &&
-   126                 (strName != _T("Shell_TrayWnd")) && (strName != _T("Winamp v1.x")) && (strName != _T("Winamp EQ")) &&
-   127                 (strName != _T("Winamp PE")) && (strName != _T("Winamp MB"))
-   128                  && (strName != _T("Chrome_WidgetWin_0"))) // chrome hack
128         { 129         {
129                 drawCaption(hForegroundWnd, nStyle); 130                 drawCaption(hForegroundWnd, nStyle);
130         } 131         }
131 } 132 }
132 133
Line 279... Line 280...
279 void TitleInfo::setSearchCaption(CStdString newSearchCaption) 280 void TitleInfo::setSearchCaption(CStdString newSearchCaption)
280 { 281 {
281         CStdString strSearchCaption; 282         CStdString strSearchCaption;
282         strSearchCaption = newSearchCaption; 283         strSearchCaption = newSearchCaption;
283 284
284         char* token = strtok(strSearchCaption.GetBuffer(512), ";"); -  
-   285         TCHAR* token = _tcstok(strSearchCaption.GetBuffer(512), _T(";"));
285         strSearchCaption.ReleaseBuffer(); 286         strSearchCaption.ReleaseBuffer();
286 287
287         for (int i=0; i < 10; i++) 288         for (int i=0; i < 10; i++)
288         { 289         {
289                 if (token != NULL) 290                 if (token != NULL)
290                         pSearchCaption[i] = token; 291                         pSearchCaption[i] = token;
291                 else 292                 else
292                         pSearchCaption[i].Empty(); 293                         pSearchCaption[i].Empty();
293 294
294                 token = strtok(NULL, ";"); -  
-   295                 token = _tcstok(NULL, _T(";"));
295         } 296         }
296 } 297 }
297 298
298 bool TitleInfo::isStringInCaption(CStdString WindowText) 299 bool TitleInfo::isStringInCaption(CStdString WindowText)
299 { 300 {