Permalink
Browse files

rename snd_dma to snd_main

  • Loading branch information...
1 parent 9a87f46 commit 19898a4ec884e551a848dd3d7f2b201418e11e3c @jite committed Aug 16, 2011
Showing with 4 additions and 32 deletions.
  1. +1 −1 Makefile.list
  2. +0 −27 gl_framebuffer.c
  3. +1 −2 snd_dma.c → snd_main.c
  4. +1 −1 snd_mix.c
  5. +1 −1 snd_pulseaudio.c
View
@@ -78,7 +78,7 @@ CLIENT_C_FILES := \
settings_page \
sha1 \
skin \
- snd_dma \
+ snd_main \
snd_mem \
snd_mix \
snd_ov \
View
@@ -23,14 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "gl_framebuffer.h"
cvar_t framebuffer = {"framebuffer", "0"};
-/*
-cvar_t fb_width = {"fb_width","0"};
-cvar_t fb_height = {"fb_height","0"};
-cvar_t fb_ratio_w = {"fb_ratio_w","0"};
-cvar_t fb_ratio_h = {"fb_ratio_h","0"};
-cvar_t fb_x = {"fb_x","0"};
-cvar_t fb_y = {"fb_y","0"};
-*/
fb_t main_fb; // The main framebuffer that can be used generally to draw things offscreen.
@@ -68,7 +60,6 @@ extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fEXT = NULL;
void Framebuffer_Init (void)
{
char *ext = (char*)qglGetString( GL_EXTENSIONS );
-// int temp;
// FIXME: alredy initialized, what to do?
// doubt this will work on vid_restart...
@@ -77,12 +68,6 @@ void Framebuffer_Init (void)
return;
}
-/* wtf, and a bit later set to use_framebuffer = true;
- if ((temp = COM_CheckParm("-framebuffer")) && temp + 1 < COM_Argc())
- {
- use_framebuffer = Q_atoi(COM_Argv(temp+1));
- }
-*/
// Check if the driver supports framebuffers.
if( strstr( ext, "EXT_framebuffer_object" ) == NULL || !strstr(ext, "GL_ARB_multitexture"))
@@ -133,17 +118,6 @@ void Framebuffer_Init (void)
return;
}
- /*
- Cmd_AddCommand("framebuffer_load", Framebuffer_Main_Init);
-
- Cvar_Register(&fb_width);
- Cvar_Register(&fb_height);
- Cvar_Register(&fb_ratio_w);
- Cvar_Register(&fb_ratio_h);
- Cvar_Register(&fb_x);
- Cvar_Register(&fb_y);
- */
-
// FIXME: which group we belong?
Cvar_Register(&framebuffer);
}
@@ -228,7 +202,6 @@ void Framebuffer_Create (fb_t *fbs)
// Initializing the texture.
glBindTexture(GL_TEXTURE_2D, fbs->texture);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-// glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, fbs->width, fbs->height, 0, GL_RGB, GL_FLOAT, NULL);
glTexImage2D(GL_TEXTURE_2D, 0, 4, fbs->width, fbs->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
View
@@ -16,9 +16,8 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: snd_dma.c,v 1.48 2007-09-26 21:51:34 tonik Exp $
*/
-// snd_dma.c -- main control for any streaming sound output device
+// snd_main.c -- main control for any streaming sound output device
#include "quakedef.h"
#include "qsound.h"
View
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Id: snd_mix.c,v 1.15 2007-03-11 06:01:42 disconn3ct Exp $
*/
-// snd_mix.c -- portable code to mix sounds for snd_dma.c
+// snd_mix.c -- portable code to mix sounds for snd_main.c
#include "quakedef.h"
#include "qsound.h"
View
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// cvars
/////////////////////////////////////////////////////////////////////
-extern cvar_t s_pulseaudio_latency; // moved to snd_dma.c atm..
+extern cvar_t s_pulseaudio_latency; // moved to snd_main.c atm..
/////////////////////////////////////////////////////////////////////
// private data

0 comments on commit 19898a4

Please sign in to comment.