Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: SDFileSystem_Warning_Fixed
Diff: FileSelectorWav.cpp
- Revision:
- 12:f73e11831c1c
- Parent:
- 11:c33c711a5712
- Child:
- 17:abfd6af9a236
--- a/FileSelectorWav.cpp Wed Mar 15 23:45:48 2017 +0000
+++ b/FileSelectorWav.cpp Thu Mar 16 23:47:50 2017 +0000
@@ -2,7 +2,7 @@
// FileSelector class
// SD カード内のファイル名の一覧を表示し,ファイルを選択する
//
-// 2016/11/08, Copyright (c) 2016 MIKAMI, Naoki
+// 2017/03/17, Copyright (c) 2017 MIKAMI, Naoki
//--------------------------------------------------------------
#include "FileSelectorWav.hpp"
@@ -16,7 +16,7 @@
fileNames_(maxFiles), fileNameLabels_(MAX_LIST_PAGE_),
next_(50, 238, 64, 36, 2, (string[]){"<", ">"}, 10, 0, 2, -1, Font24),
pageLabel_(210, 250, Label::LEFT, Font16),
- lcd_(GuiBase::GetLcdPtr()), sdReader_(reader), page_(1)
+ lcd_(GuiBase::GetLcd()), sdReader_(reader), page_(1)
{
Array<string> nonString(MAX_LIST_PAGE_, "");
rect_ = new ButtonGroup(X_, Y_, W_H_, W_H_, MAX_LIST_PAGE_,
@@ -128,8 +128,8 @@
void FileSelector::Erase(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
uint32_t color)
{
- lcd_->SetTextColor(color);
- lcd_->FillRect(x, y, width, height);
+ lcd_.SetTextColor(color);
+ lcd_.FillRect(x, y, width, height);
}
// 拡張子を削除したファイル名を取得