godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/stream_editor_plugin.h
View File

@@ -29,9 +29,8 @@
#ifndef STREAM_EDITOR_PLUGIN_H
#define STREAM_EDITOR_PLUGIN_H
#include "editor/editor_plugin.h"
#include "editor/editor_node.h"
#include "editor/editor_plugin.h"
#include "scene/audio/stream_player.h"
/**
@@ -40,35 +39,35 @@
class StreamEditor : public Control {
OBJ_TYPE(StreamEditor, Control );
OBJ_TYPE(StreamEditor, Control);
Button * play;
Button * stop;
Button *play;
Button *stop;
Panel *panel;
Node *node;
void _play();
void _stop();
protected:
void _notification(int p_what);
void _node_removed(Node *p_node);
static void _bind_methods();
public:
public:
void edit(Node *p_stream);
StreamEditor();
};
class StreamEditorPlugin : public EditorPlugin {
OBJ_TYPE( StreamEditorPlugin, EditorPlugin );
OBJ_TYPE(StreamEditorPlugin, EditorPlugin);
StreamEditor *stream_editor;
EditorNode *editor;
public:
virtual String get_name() const { return "Stream"; }
bool has_main_screen() const { return false; }
virtual void edit(Object *p_node);
@@ -77,7 +76,6 @@ public:
StreamEditorPlugin(EditorNode *p_node);
~StreamEditorPlugin();
};
#endif // STREAM_EDITOR_PLUGIN_H