7 files changed, 23 insertions, 182 deletions

diff --git a/src/video_core/src/renderer_base.h b/src/video_core/src/renderer_base.h
index 61c568694..94748d690 100644
--- a/src/video_core/src/renderer_base.h
+++ b/src/video_core/src/renderer_base.h
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    renderer_base.h
- * @author  bunnei
- * @date    2014-04-05
- * @brief   Renderer base class for new video core
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.cpp b/src/video_core/src/renderer_opengl/renderer_opengl.cpp
index 8a4d1ab72..6010bcbc3 100644
--- a/src/video_core/src/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/src/renderer_opengl/renderer_opengl.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    renderer_opengl.cpp
- * @author  bunnei
- * @date    2014-04-05
- * @brief   Renderer for OpenGL 3.x
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "mem_map.h"
 #include "video_core.h"
diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.h b/src/video_core/src/renderer_opengl/renderer_opengl.h
index b91fcacaa..86dc7b70e 100644
--- a/src/video_core/src/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/src/renderer_opengl/renderer_opengl.h
@@ -1,32 +1,11 @@
-/**
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    renderer_opengl.h
- * @author  bunnei
- * @date    2014-04-05
- * @brief   Renderer for OpenGL 3.x
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
 #include <GL/glew.h>
 
-
 #include "common.h"
 #include "emu_window.h"
 
diff --git a/src/video_core/src/utils.cpp b/src/video_core/src/utils.cpp
index a5e702f67..a6dd1e02c 100644
--- a/src/video_core/src/utils.cpp
+++ b/src/video_core/src/utils.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2005-2012 Gekko Emulator
- *
- * @file    utils.cpp
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2012-12-28
- * @brief   Utility functions (in general, not related to emulation) useful for video core
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/video_core/src/utils.h b/src/video_core/src/utils.h
index 2d7fa4a3a..c417342e1 100644
--- a/src/video_core/src/utils.h
+++ b/src/video_core/src/utils.h
@@ -1,32 +1,13 @@
-/**
- * Copyright (C) 2005-2012 Gekko Emulator
- *
- * @file    utils.h
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2012-12-28
- * @brief   Utility functions (in general, not related to emulation) useful for video core
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
-#include "common_types.h"
 #include <string>
 
+#include "common_types.h"
+
 namespace FormatPrecision {
 
 /// Adjust RGBA8 color with RGBA6 precision
diff --git a/src/video_core/src/video_core.cpp b/src/video_core/src/video_core.cpp
index 52ff90488..6c0c415f5 100644
--- a/src/video_core/src/video_core.cpp
+++ b/src/video_core/src/video_core.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    video_core.cpp
- * @author  bunnei
- * @date    2014-04-05
- * @brief   Main module for new video core
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "common.h"
 #include "emu_window.h"
@@ -41,30 +21,11 @@ EmuWindow*      g_emu_window    = NULL;     ///< Frontend emulator window
 RendererBase*   g_renderer      = NULL;     ///< Renderer plugin
 int             g_current_frame = 0;
 
-int VideoEntry(void*) {
-    if (g_emu_window == NULL) {
-        ERROR_LOG(VIDEO, "VideoCore::VideoEntry called without calling Init()!");
-    }
-    g_emu_window->MakeCurrent();
-    //for(;;) {
-    //    gp::Fifo_DecodeCommand();
-    //}
-    return 0;
-}
-
 /// Start the video core
 void Start() {
     if (g_emu_window == NULL) {
         ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!");
     }
-    //if (common::g_config->enable_multicore()) {
-    //    g_emu_window->DoneCurrent();
-    //    g_video_thread = SDL_CreateThread(VideoEntry, NULL, NULL);
-    //    if (g_video_thread == NULL) {
-    //        LOG_ERROR(TVIDEO, "Unable to create thread: %s... Exiting\n", SDL_GetError());
-    //        exit(1);
-    //    }
-    //}
 }
 
 /// Initialize the video core
diff --git a/src/video_core/src/video_core.h b/src/video_core/src/video_core.h
index 10b8f1105..19bf49dd7 100644
--- a/src/video_core/src/video_core.h
+++ b/src/video_core/src/video_core.h
@@ -1,26 +1,6 @@
-/*!
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    video_core.h
- * @author  bunnei
- * @date    2014-04-05
- * @brief   Main module for new video core
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once