i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Use static MessageRunners,

Browse Source 
- Banlance the process of retrieving the remote names, which is blocks the Window Looper, as get remote name is an expensive operation.
Now it waits half second between each operation which gives a better feeling(without using extra thread, that will come when there is an standard barberpole)



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29403 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2009-03-05 21:36:17 +00:00
parent 97b7c9a091
commit 5bf53b09c2
2 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/bluetooth/InquiryPanel.cpp
+54 -42
View File
@@ -38,6 +38,7 @@ static const uint32 kMsgAddListDevice = 'aDdv';
static const uint32 kMsgSelected = 'isLt';
static const uint32 kMsgSecond = 'sCMs';
static const uint32 kMsgRetrieve = 'IrEt';
class PanelDiscoveryListener : public DiscoveryListener {
@@ -85,12 +86,12 @@ private:
InquiryPanel::InquiryPanel(BRect frame, LocalDevice* lDevice)
: BWindow(frame, "Bluetooth", B_FLOATING_WINDOW,
B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
B_ALL_WORKSPACES ), fScanning(false)
B_ALL_WORKSPACES ), fMessenger(this)
, fScanning(false)
, fRetrieving(false)
, fLocalDevice(lDevice)
{
// BRect iDontCare(0,0,0,0);
SetLayout(new BGroupLayout(B_HORIZONTAL));
fScanProgress = new BStatusBar("status", "Scanning progress", "");
@@ -135,8 +136,9 @@ InquiryPanel::InquiryPanel(BRect frame, LocalDevice* lDevice)
fInquiryButton->SetEnabled(false);
}
fRunner = new BMessageRunner(BMessenger(this), new BMessage(kMsgSecond), 1000000L);
fRetrieveMessage = new BMessage(kMsgRetrieve);
fSecondsMessage = new BMessage(kMsgSecond);
AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
.Add(fMessage)
@@ -161,13 +163,14 @@ InquiryPanel::MessageReceived(BMessage *message)
static float timer = 0; // expected time of the inquiry process
static float scanningTime = 0;
static int32 retrievalIndex = 0;
static bool labelPlaced = false;
switch (message->what) {
case kMsgInquiry:
fDiscoveryAgent->StartInquiry(BT_GIAC, fDiscoveryListener, GetInquiryTime());
timer = BT_BASE_INQUIRY_TIME * GetInquiryTime();
timer = BT_BASE_INQUIRY_TIME * GetInquiryTime() + 1;
fScanProgress->SetMaxValue(timer); // does it works as expected?
break;
@@ -202,25 +205,35 @@ InquiryPanel::MessageReceived(BMessage *message)
case kMsgStart:
fRemoteList->MakeEmpty();
fScanProgress->Reset();
scanningTime = 0;
fScanProgress->Reset();
fScanProgress->SetTo(1);
fScanProgress->SetTrailingText("Starting scan...");
fScanProgress->SetBarColor(activeColor);
fAddButton->SetEnabled(false);
fInquiryButton->SetEnabled(false);
BMessageRunner::StartSending(fMessenger, fSecondsMessage, 1000000, timer);
scanningTime = 1;
fScanning = true;
UpdateUIStatus();
break;
case kMsgFinish:
retrievalIndex = 0;
fScanning = false;
fRetrieving = true;
labelPlaced = false;
fScanProgress->SetTo(100);
fScanProgress->SetTrailingText("Retrieving names...");
BMessageRunner::StartSending(fMessenger, fRetrieveMessage, 1000000, 1);
UpdateListStatus();
UpdateUIStatus();
break;
case kMsgSecond:
{
if (fScanning) {
if (fScanning && scanningTime < timer) {
BString elapsedTime = "Remaining ";
fScanProgress->SetTo(scanningTime*100/timer); // TODO should not be needed if SetMaxValue works...
@@ -230,16 +243,34 @@ InquiryPanel::MessageReceived(BMessage *message)
scanningTime = scanningTime + 1;
}
break;
case kMsgRetrieve:
if (fRetrieving) {
if (retrievalIndex < fDiscoveryAgent->RetrieveDevices(0).CountItems()) {
if (!labelPlaced) {
labelPlaced = true;
BString progressText = "Retrieving name of ";
progressText << bdaddrUtils::ToString(fDiscoveryAgent->RetrieveDevices(0).ItemAt(
retrievalIndex)->GetBluetoothAddress());
fScanProgress->SetTrailingText(progressText.String());
} else {
// Really erally expensive operation should be done in a separate thread
// once Haiku gets a BarberPole in API replacing the progress bar
((DeviceListItem*)fRemoteList->ItemAt(retrievalIndex))->SetDevice((BluetoothDevice*)
fDiscoveryAgent->RetrieveDevices(0).ItemAt(retrievalIndex));
fRemoteList->InvalidateItem(retrievalIndex);
retrievalIndex++;
labelPlaced = false;
}
((DeviceListItem*)fRemoteList->ItemAt(retrievalIndex))->
SetDevice((BluetoothDevice*)fDiscoveryAgent->RetrieveDevices(0).ItemAt(retrievalIndex));
fRemoteList->Invalidate();
retrievalIndex++;
BMessageRunner::StartSending(fMessenger, fRetrieveMessage, 500000, 1);
} else {
@@ -247,12 +278,12 @@ InquiryPanel::MessageReceived(BMessage *message)
retrievalIndex = 0;
fScanProgress->SetBarColor(ui_color(B_PANEL_BACKGROUND_COLOR));
fScanProgress->SetTrailingText("Scanning completed ...");
fScanProgress->SetTrailingText("Scanning completed.");
fInquiryButton->SetEnabled(true);
UpdateListStatus();
}
}
UpdateUIStatus();
}
break;
default:
@@ -262,25 +293,6 @@ InquiryPanel::MessageReceived(BMessage *message)
}
void
InquiryPanel::UpdateUIStatus(void)
{
if (fScanning) {
fAddButton->SetEnabled(false);
fInquiryButton->SetEnabled(false);
fScanProgress->SetBarColor(activeColor);
fAddButton->SetEnabled(false);
} else if (fRetrieving) {
fInquiryButton->SetEnabled(true);
fScanProgress->SetTo(100);
fScanProgress->SetTrailingText("Retrieving names ...");
} else {
}
}
void
InquiryPanel::UpdateListStatus(void)
{
src/preferences/bluetooth/InquiryPanel.h
+3 -3
View File
@@ -34,7 +34,9 @@ private:
BTextView* fMessage;
BListView* fRemoteList;
BScrollView* fScrollView;
BMessageRunner* fRunner;
BMessage* fRetrieveMessage;
BMessage* fSecondsMessage;
BMessenger fMessenger;
bool fScanning;
bool fRetrieving;
@@ -42,8 +44,6 @@ private:
DiscoveryAgent* fDiscoveryAgent;
DiscoveryListener* fDiscoveryListener;
void UpdateUIStatus(void);
void UpdateListStatus(void);
rgb_color activeColor;