third-party-mirrors/spek
1
0
Fork 0
mirror of https://github.com/alexkay/spek.git synced 2025-06-04 01:21:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tidy

Browse Source
This commit is contained in:
Alexander Kojevnikov 2012-09-05 21:11:14 -07:00
parent 969b13b80f
commit a380a77bdd
3 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS.md
View File

@ -23,7 +23,7 @@ Translators:
* Tiago Rinaldi * Tiago Rinaldi
* Wouter Bolsterlee * Wouter Bolsterlee
Artist: Artists:
* Olga Vasylevska * Olga Vasylevska
* Silvestre Herrera * Silvestre Herrera

2
lib/spek-audio.c
View File

@ -196,7 +196,7 @@ int spek_audio_read(struct spek_audio_context *cx) {
} }
} }
void spek_audio_close (struct spek_audio_context *cx) void spek_audio_close(struct spek_audio_context *cx)
{ {
if (cx->properties.codec_name != NULL) { if (cx->properties.codec_name != NULL) {
free(cx->properties.codec_name); free(cx->properties.codec_name);

64
src/spek-artwork.cc
View File

@ -25,7 +25,7 @@ class SpekArtProvider : public wxArtProvider
{ {
protected: protected:
virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size); virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size);
#if ART_HAS_ICON_BUNDLES #if wxCHECK_VERSION(2, 9, 0)
virtual wxIconBundle CreateIconBundle(const wxArtID& id, const wxArtClient& client); virtual wxIconBundle CreateIconBundle(const wxArtID& id, const wxArtClient& client);
#endif #endif
}; };
@ -33,74 +33,72 @@ protected:
wxBitmap SpekArtProvider::CreateBitmap( wxBitmap SpekArtProvider::CreateBitmap(
const wxArtID& id, const wxArtClient& client, const wxSize& size) const wxArtID& id, const wxArtClient& client, const wxSize& size)
{ {
if (id == ART_SPEK) {
#ifdef OS_UNIX #ifdef OS_UNIX
if (id == ART_SPEK) {
return wxArtProvider::GetBitmap(wxT("spek"), client, size); return wxArtProvider::GetBitmap(wxT("spek"), client, size);
#endif
} }
if (id == ART_ABOUT) { if (id == ART_ABOUT) {
#ifdef OS_UNIX
return wxArtProvider::GetBitmap(wxT("gtk-about"), client, size); return wxArtProvider::GetBitmap(wxT("gtk-about"), client, size);
#endif
#ifdef OS_WIN
return wxIcon(wxT("about"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
#endif
#ifdef OS_OSX
return wxBitmap(wxT("about"), wxBITMAP_TYPE_PNG_RESOURCE);
#endif
} }
if (id == ART_OPEN) { if (id == ART_OPEN) {
#ifdef OS_UNIX
return wxArtProvider::GetBitmap(wxT("gtk-open"), client, size); return wxArtProvider::GetBitmap(wxT("gtk-open"), client, size);
#endif
#ifdef OS_WIN
return wxIcon(wxT("open"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
#endif
#ifdef OS_OSX
return wxBitmap(wxT("open"), wxBITMAP_TYPE_PNG_RESOURCE);
#endif
} }
if (id == ART_SAVE) { if (id == ART_SAVE) {
#ifdef OS_UNIX
return wxArtProvider::GetBitmap(wxT("gtk-save"), client, size); return wxArtProvider::GetBitmap(wxT("gtk-save"), client, size);
#endif
#ifdef OS_WIN
return wxIcon(wxT("save"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
#endif
#ifdef OS_OSX
return wxBitmap(wxT("save"), wxBITMAP_TYPE_PNG_RESOURCE);
#endif
} }
if (id == ART_CLOSE) { if (id == ART_CLOSE) {
#ifdef OS_UNIX
return wxArtProvider::GetBitmap(wxT("gtk-close"), client, size); return wxArtProvider::GetBitmap(wxT("gtk-close"), client, size);
}
#endif #endif
#ifdef OS_WIN #ifdef OS_WIN
if (id == ART_ABOUT) {
return wxIcon(wxT("about"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
}
if (id == ART_OPEN) {
return wxIcon(wxT("open"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
}
if (id == ART_SAVE) {
return wxIcon(wxT("save"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
}
if (id == ART_CLOSE) {
return wxIcon(wxT("close"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16); return wxIcon(wxT("close"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
}
#endif #endif
#ifdef OS_OSX #ifdef OS_OSX
return wxBitmap(wxT("close"), wxBITMAP_TYPE_PNG_RESOURCE); if (id == ART_ABOUT) {
#endif return wxBitmap(wxT("about"), wxBITMAP_TYPE_PNG_RESOURCE);
} }
if (id == ART_OPEN) {
return wxBitmap(wxT("open"), wxBITMAP_TYPE_PNG_RESOURCE);
}
if (id == ART_SAVE) {
return wxBitmap(wxT("save"), wxBITMAP_TYPE_PNG_RESOURCE);
}
if (id == ART_CLOSE) {
return wxBitmap(wxT("close"), wxBITMAP_TYPE_PNG_RESOURCE);
}
#endif
return wxNullBitmap; return wxNullBitmap;
} }
#if ART_HAS_ICON_BUNDLES #if wxCHECK_VERSION(2, 9, 0)
wxIconBundle SpekArtProvider::CreateIconBundle(const wxArtID& id, const wxArtClient& client) wxIconBundle SpekArtProvider::CreateIconBundle(const wxArtID& id, const wxArtClient& client)
{ {
if (id == ART_SPEK) {
#ifdef OS_UNIX #ifdef OS_UNIX
if (id == ART_SPEK) {
return wxArtProvider::GetIconBundle(wxT("spek"), client); return wxArtProvider::GetIconBundle(wxT("spek"), client);
}
#endif #endif
#ifdef OS_WIN #ifdef OS_WIN
if (id == ART_SPEK) {
wxIconBundle bundle; wxIconBundle bundle;
bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16)); bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16));
bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24)); bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24));
bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 32, 32)); bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 32, 32));
bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 48, 48)); bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 48, 48));
return bundle; return bundle;
#endif
} }
#endif
return wxNullIconBundle; return wxNullIconBundle;
} }
#endif #endif