diff options
| author | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-19 00:29:12 +0400 |
|---|---|---|
| committer | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-19 00:29:12 +0400 |
| commit | b072e90c262fef233872e34f93bf298ce0d1fa03 (patch) | |
| tree | ee8fd84e6d0e594d6e884e8be7e31d2c24be47fe /src/apps/mplayerc/ISDb.cpp | |
| parent | 5215e9e5c05dcfc26b4314a2b52966cbcea5306f (diff) | |
Style patch part1. based on newly released astyle 1.24.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1790 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc/ISDb.cpp')
| -rw-r--r-- | src/apps/mplayerc/ISDb.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/src/apps/mplayerc/ISDb.cpp b/src/apps/mplayerc/ISDb.cpp index c5870cf3f..c6bfd91e1 100644 --- a/src/apps/mplayerc/ISDb.cpp +++ b/src/apps/mplayerc/ISDb.cpp @@ -28,86 +28,86 @@ bool hash(LPCTSTR fn, filehash& fh)
{
- CFile f;
- CFileException fe;
- if(!f.Open(fn, CFile::modeRead|CFile::osSequentialScan|CFile::shareDenyNone, &fe))
+ CFile f;
+ CFileException fe;
+ if(!f.Open(fn, CFile::modeRead|CFile::osSequentialScan|CFile::shareDenyNone, &fe))
return false;
- CPath p(fn);
- p.StripPath();
- fh.name = (LPCTSTR)p;
+ CPath p(fn);
+ p.StripPath();
+ fh.name = (LPCTSTR)p;
- fh.size = f.GetLength();
-
- fh.hash = fh.size;
- for(UINT64 tmp = 0, i = 0; i < 65536/sizeof(tmp) && f.Read(&tmp, sizeof(tmp)); fh.hash += tmp, i++);
- f.Seek(max(0, (INT64)fh.size - 65536), CFile::begin);
- for(UINT64 tmp = 0, i = 0; i < 65536/sizeof(tmp) && f.Read(&tmp, sizeof(tmp)); fh.hash += tmp, i++);
+ fh.size = f.GetLength();
- return true;
+ fh.hash = fh.size;
+ for(UINT64 tmp = 0, i = 0; i < 65536/sizeof(tmp) && f.Read(&tmp, sizeof(tmp)); fh.hash += tmp, i++);
+ f.Seek(max(0, (INT64)fh.size - 65536), CFile::begin);
+ for(UINT64 tmp = 0, i = 0; i < 65536/sizeof(tmp) && f.Read(&tmp, sizeof(tmp)); fh.hash += tmp, i++);
+
+ return true;
}
void hash(CPlaylist& pl, CList<filehash>& fhs)
{
- fhs.RemoveAll();
+ fhs.RemoveAll();
- POSITION pos = pl.GetHeadPosition();
- while(pos)
- {
- CString fn = pl.GetNext(pos).m_fns.GetHead();
- if(AfxGetAppSettings().Formats.FindExt(CPath(fn).GetExtension().MakeLower(), true))
- continue;
+ POSITION pos = pl.GetHeadPosition();
+ while(pos)
+ {
+ CString fn = pl.GetNext(pos).m_fns.GetHead();
+ if(AfxGetAppSettings().Formats.FindExt(CPath(fn).GetExtension().MakeLower(), true))
+ continue;
- filehash fh;
- if(!hash(fn, fh))
- continue;
+ filehash fh;
+ if(!hash(fn, fh))
+ continue;
- fhs.AddTail(fh);
- }
+ fhs.AddTail(fh);
+ }
}
CStringA makeargs(CPlaylist& pl)
{
- CList<filehash> fhs;
- hash(pl, fhs);
+ CList<filehash> fhs;
+ hash(pl, fhs);
- CAtlList<CStringA> args;
+ CAtlList<CStringA> args;
- POSITION pos = fhs.GetHeadPosition();
- for(int i = 0; pos; i++)
- {
- filehash& fh = fhs.GetNext(pos);
+ POSITION pos = fhs.GetHeadPosition();
+ for(int i = 0; pos; i++)
+ {
+ filehash& fh = fhs.GetNext(pos);
- CStringA str;
- str.Format("name[%d]=%s&size[%d]=%016I64x&hash[%d]=%016I64x",
- i, UrlEncode(CStringA(fh.name)),
- i, fh.size,
- i, fh.hash);
+ CStringA str;
+ str.Format("name[%d]=%s&size[%d]=%016I64x&hash[%d]=%016I64x",
+ i, UrlEncode(CStringA(fh.name)),
+ i, fh.size,
+ i, fh.hash);
- args.AddTail(str);
- }
+ args.AddTail(str);
+ }
- return Implode(args, '&');
+ return Implode(args, '&');
}
bool OpenUrl(CInternetSession& is, CString url, CStringA& str)
{
- str.Empty();
+ str.Empty();
- try
- {
- CAutoPtr<CStdioFile> f(is.OpenURL(url, 1, INTERNET_FLAG_TRANSFER_BINARY|INTERNET_FLAG_EXISTING_CONNECT));
+ try
+ {
+ CAutoPtr<CStdioFile> f(is.OpenURL(url, 1, INTERNET_FLAG_TRANSFER_BINARY|INTERNET_FLAG_EXISTING_CONNECT));
- char buff[1024];
- for(int len; (len = f->Read(buff, sizeof(buff))) > 0; str += CStringA(buff, len));
+ char buff[1024];
+ for(int len; (len = f->Read(buff, sizeof(buff))) > 0; str += CStringA(buff, len));
- f->Close(); // must close it because the desctructor doesn't seem to do it and we will get an exception when "is" is destroying
- }
- catch(CInternetException* ie)
- {
- ie->Delete();
- return false;
- }
+ f->Close(); // must close it because the desctructor doesn't seem to do it and we will get an exception when "is" is destroying
+ }
+ catch(CInternetException* ie)
+ {
+ ie->Delete();
+ return false;
+ }
- return true;
+ return true;
}
|