← Back to branch summary

~mixxxdevelopers/mixxx/engine-control-refactor

« back to all changes in this revision

Viewing changes to mixxx/src/controllers/controllermanager.h

  • Committer: RJ Ryan
  • Date: 2013-06-04 00:41:29 UTC
  • mfrom: (2890.22.101 mixxx)
  • Revision ID: rryan@mixxx.org-20130604004129-8jjxkicsb3givu4a
Merging from lp:mixxx.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/controllers/controllermanager.h
69
69
    void maybeStartOrStopPolling();
70
70
 
71
71
    static QString presetFilenameFromName(QString name) {
72
 
        return name.replace(" ", "_");
 
72
        return name.replace(" ", "_").replace("/", "_").replace("\\", "_");
73
73
    }
74
74
 
75
75
  private:
 
76
    QList<QString> getScriptPaths();
 
77
 
76
78
    ConfigObject<ConfigValue> *m_pConfig;
77
79
    ControllerLearningEventFilter* m_pControllerLearningEventFilter;
78
80
    QTimer m_pollTimer;