summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
committer ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
commitcc3b682e52bf097d31db78032aad01d6a0b12e94 (patch)
tree860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/machine.h
parent7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff)
parenta649a95488e1fc85813dda747dc74c596496bd1c (diff)
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/machine.h')
-rw-r--r--src/emu/machine.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 9fb264f9963..a989ba2c874 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -182,7 +182,7 @@ public:
bool ui_active() const { return m_ui_active; }
const char *basename() const { return m_basename.c_str(); }
int sample_rate() const { return m_sample_rate; }
- bool save_or_load_pending() const { return m_saveload_pending_file; }
+ bool save_or_load_pending() const { return !m_saveload_pending_file.empty(); }
screen_device *first_screen() const { return primary_screen; }
// additional helpers
@@ -253,14 +253,14 @@ private:
// internal helpers
void start();
void set_saveload_filename(const char *filename);
- astring get_statename(const char *statename_opt);
+ std::string get_statename(const char *statename_opt);
void fill_systime(system_time &systime, time_t t);
void handle_saveload();
void soft_reset(void *ptr = NULL, INT32 param = 0);
void watchdog_fired(void *ptr = NULL, INT32 param = 0);
void watchdog_vblank(screen_device &screen, bool vblank_state);
const char *image_parent_basename(device_t *device);
- astring &nvram_filename(astring &result, device_t &device);
+ std::string &nvram_filename(std::string &result, device_t &device);
void nvram_load();
void nvram_save();
@@ -306,8 +306,8 @@ private:
UINT32 m_rand_seed; // current random number seed
bool m_ui_active; // ui active or not (useful for games / systems with keyboard inputs)
time_t m_base_time; // real time at initial emulation time
- astring m_basename; // basename used for game-related paths
- astring m_context; // context string buffer
+ std::string m_basename; // basename used for game-related paths
+ std::string m_context; // context string buffer
int m_sample_rate; // the digital audio sample rate
auto_pointer<emu_file> m_logfile; // pointer to the active log file
@@ -320,7 +320,7 @@ private:
};
saveload_schedule m_saveload_schedule;
attotime m_saveload_schedule_time;
- astring m_saveload_pending_file;
+ std::string m_saveload_pending_file;
const char * m_saveload_searchpath;
// notifier callbacks