Fix style issues in MediaAddonServer
Signed-off-by: Jérôme Duval <[email protected]>
This commit is contained in:
committed by
Jérôme Duval
parent
4d04c262c9
commit
5a1e452ba2
@@ -67,14 +67,14 @@ typedef std::vector<media_node> NodeVector;
|
|||||||
|
|
||||||
|
|
||||||
struct AddOnInfo {
|
struct AddOnInfo {
|
||||||
media_addon_id id;
|
media_addon_id id;
|
||||||
bool wants_autostart;
|
bool wants_autostart;
|
||||||
int32 flavor_count;
|
int32 flavor_count;
|
||||||
|
|
||||||
NodeVector active_flavors;
|
NodeVector active_flavors;
|
||||||
|
|
||||||
BMediaAddOn* addon;
|
// if != NULL, need to call gDormantNodeManager->PutAddOn(id)
|
||||||
// if != NULL, need to call gDormantNodeManager->PutAddOn(id)
|
BMediaAddOn* addon;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -126,13 +126,13 @@ private:
|
|||||||
|
|
||||||
class MediaAddonServer::MonitorHandler : public AddOnMonitorHandler {
|
class MediaAddonServer::MonitorHandler : public AddOnMonitorHandler {
|
||||||
public:
|
public:
|
||||||
MonitorHandler(MediaAddonServer* server);
|
MonitorHandler(MediaAddonServer* server);
|
||||||
|
|
||||||
virtual void AddOnEnabled(const add_on_entry_info* info);
|
virtual void AddOnEnabled(const add_on_entry_info* info);
|
||||||
virtual void AddOnDisabled(const add_on_entry_info* info);
|
virtual void AddOnDisabled(const add_on_entry_info* info);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MediaAddonServer* fServer;
|
MediaAddonServer* fServer;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -274,8 +274,8 @@ MediaAddonServer::ReadyToRun()
|
|||||||
AddHandler(fMonitorHandler);
|
AddHandler(fMonitorHandler);
|
||||||
|
|
||||||
BMessage pulse(B_PULSE);
|
BMessage pulse(B_PULSE);
|
||||||
|
// the monitor handler needs a pulse to check if add-ons are ready
|
||||||
fPulseRunner = new BMessageRunner(fMonitorHandler, &pulse, 1000000LL);
|
fPulseRunner = new BMessageRunner(fMonitorHandler, &pulse, 1000000LL);
|
||||||
// the monitor handler needs a pulse to check if add-ons are ready
|
|
||||||
|
|
||||||
fMonitorHandler->AddAddOnDirectories("media");
|
fMonitorHandler->AddAddOnDirectories("media");
|
||||||
|
|
||||||
@@ -339,7 +339,7 @@ MediaAddonServer::MessageReceived(BMessage* message)
|
|||||||
|
|
||||||
PlayMediaFile(type, name);
|
PlayMediaFile(type, name);
|
||||||
message->SendReply((uint32)B_OK);
|
message->SendReply((uint32)B_OK);
|
||||||
// TODO: don't know which reply is expected
|
// TODO: don't know which reply is expected
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -533,7 +533,8 @@ MediaAddonServer::_AddOnAdded(const char* path, ino_t fileNode)
|
|||||||
AddOnInfo& info = found->second;
|
AddOnInfo& info = found->second;
|
||||||
|
|
||||||
info.id = id;
|
info.id = id;
|
||||||
info.wants_autostart = false; // temporary default
|
// temporary default
|
||||||
|
info.wants_autostart = false;
|
||||||
info.flavor_count = 0;
|
info.flavor_count = 0;
|
||||||
info.addon = addon;
|
info.addon = addon;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user