Attachment #87003 for bug #132814

View | Details | Raw Unified | Return to bug 132814
Collapse All | Expand All




++ apricots/apricots.cpp

int main(int, char**){
#endif

atexit(SDL_Quit);
  // Initialize data
  gamedata g;
  init_data(g);
++ apricots/sampleio.cpp

  alListenerfv(AL_ORIENTATION, front );

  // Load in samples
  ALvoid* data = malloc(5 * (512 * 3) * 1024);
  alGenBuffers(numsamples, samples);

  for (int i = 0; i < numsamples; i++){
    ALsizei freq;
    ALboolean fileok;
    // Evil OpenAL portability fix done here
#ifdef _WIN32
    ALenum format;

    alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
    fileok = (alGetError() == AL_NO_ERROR);
#else
	samples[i] = alutCreateBufferFromFile(filenames[i]);
    ALsizei trash;
    fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
#endif
    if (samples[i] == AL_NONE){
      cerr << "sampleio: could not open " << filenames[i] << endl;
      exit(1);
    }         
    alBufferData(samples[i], format, data, filelen, freq);
  }

  // Generate Sources

    alSourcefv(sources[j], AL_ORIENTATION, back );
  }
  
  free(data);
  
}

++ configure.in


dnl Check for OpenAL
AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"])
AC_CHECK_LIB( openal, alGetError)
AC_CHECK_LIB( alut, alutInit)

KDE_CHECK_EXTRA_LIBS
all_libraries="$all_libraries $USER_LDFLAGS"

Return to bug 132814

Line Link Here

(-)file_not_specified_in_diff (-13 / +8 lines)
0	-- apricots/apricots.cpp	0	++ apricots/apricots.cpp
Lines 16-21 Link Here
16	int main(int, char**){	16	int main(int, char**){
17	#endif	17	#endif
18		18
		19	atexit(SDL_Quit);
19	// Initialize data	20	// Initialize data
20	gamedata g;	21	gamedata g;
21	init_data(g);	22	init_data(g);
22	-- apricots/sampleio.cpp	23	++ apricots/sampleio.cpp
Lines 74-85 Link Here
74	alListenerfv(AL_ORIENTATION, front );	74	alListenerfv(AL_ORIENTATION, front );
75		75
76	// Load in samples	76	// Load in samples
77	ALvoid* data = malloc(5 * (512 * 3) * 1024);
78	alGenBuffers(numsamples, samples);	77	alGenBuffers(numsamples, samples);
79		78
80	for (int i = 0; i < numsamples; i++){	79	for (int i = 0; i < numsamples; i++){
81	ALsizei freq;
82	ALboolean fileok;
83	// Evil OpenAL portability fix done here	80	// Evil OpenAL portability fix done here
84	#ifdef _WIN32	81	#ifdef _WIN32
85	ALenum format;	82	ALenum format;
Lines 87-101 Link Here
87	alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);	84	alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
88	fileok = (alGetError() == AL_NO_ERROR);	85	fileok = (alGetError() == AL_NO_ERROR);
89	#else	86	#else
90	ALsizei format;	87	samples[i] = alutCreateBufferFromFile(filenames[i]);
91	ALsizei trash;
92	fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
93	#endif	88	#endif
94	if (!fileok){	89	if (samples[i] == AL_NONE){
95	cerr << "sampleio: could not open " << filenames[i] << endl;	90	cerr << "sampleio: could not open " << filenames[i] << endl;
96	exit(1);	91	exit(1);
97	}	92	}
98	alBufferData(samples[i], format, data, filelen, freq);
99	}	93	}
100		94
101	// Generate Sources	95	// Generate Sources
Lines 107-113 Link Here
107	alSourcefv(sources[j], AL_ORIENTATION, back );	101	alSourcefv(sources[j], AL_ORIENTATION, back );
108	}	102	}
109		103
110	free(data);
111		104
112	}	105	}
113		106
114	-- configure.in	107	++ configure.in
Lines 100-106 Link Here
100		100
101	dnl Check for OpenAL	101	dnl Check for OpenAL
102	AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"])	102	AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"])
103	AC_CHECK_LIB( openal, alutInit)	103	AC_CHECK_LIB( openal, alGetError)
		104	AC_CHECK_LIB( alut, alutInit)
104		105
105	KDE_CHECK_EXTRA_LIBS	106	KDE_CHECK_EXTRA_LIBS
106	all_libraries="$all_libraries $USER_LDFLAGS"	107	all_libraries="$all_libraries $USER_LDFLAGS"