Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix_special_char_passwords_and_tag_ogg_archive_files_w_date_then_flus… #17

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix_special_char_passwords_and_tag_ogg_archive_files_w_date_then_flus… #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f2a57f
fix_special_char_passwords_and_tag_ogg_archive_files_w_date_then_flus…
ImagoTrigger Jan 29, 2018
ed51a17
new Bass lib/dll and fixups for compiling in VS2019
ImagoTrigger Feb 29, 2020
a2dc613
new Bass lib/dll and fixups for compiling in VS2019
Feb 29, 2020
3eb99fd
reBASS to the recording device when it is lost. This fixes altacast …
Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

/.vs
1 change: 1 addition & 0 deletions externals.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://www.un4seen.com/download.php?bass24
Binary file added trunk/AltaCast/release/AxInterop.MSComctlLib.2.0.dll
View file
Open in desktop
Binary file not shown.
Binary file added trunk/AltaCast/release/AxInterop.Microsoft.Vbe.Interop.Forms.2.0.dll
View file
Open in desktop
Binary file not shown.
Binary file added trunk/AltaCast/release/Interop.MSComctlLib.2.0.dll
View file
Open in desktop
Binary file not shown.
Binary file added trunk/AltaCast/release/Interop.Microsoft.Vbe.Interop.Forms.2.0.dll
View file
Open in desktop
Binary file not shown.
Binary file added trunk/AltaCast/release/stdole.dll
View file
Open in desktop
Binary file not shown.
Binary file modified trunk/AltaCast/src/Interop/Interop.MSComctlLib.2.0.dll
View file
Open in desktop
Binary file not shown.
Binary file modified trunk/AltaCast/src/Interop/Interop.Microsoft.Vbe.Interop.Forms.2.0.dll
View file
Open in desktop
Binary file not shown.
18 changes: 11 additions & 7 deletions trunk/AltaCast/src/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ VOID CALLBACK MetadataTimer(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime) {
}

session.Close();
delete session;
session.~CInternetSession();
}

CATCH_ALL(error) {
Expand Down Expand Up @@ -494,9 +494,8 @@ BOOL CALLBACK BASSwaveInputProc(HRECORD handle, const void *buffer, DWORD length
pWindow->generalStatusCallback((void *) msg);
}

/*
* setCurrentRecordingName(currentDevice);
*/


}
}

Expand Down Expand Up @@ -1069,9 +1068,9 @@ BOOL CMainWindow::OnInitDialog() {
reconnectTimerId = SetTimer(2, 1000, (TIMERPROC) ReconnectTimer);
if(m_AutoConnect) {
char buf[255];
sprintf(buf, "AutoConnecting in 5 seconds");
sprintf(buf, "AutoConnecting in 1 seconds");
generalStatusCallback(buf);
autoconnectTimerId = SetTimer(3, 5000, (TIMERPROC) AutoConnectTimer);
autoconnectTimerId = SetTimer(3, 1000, (TIMERPROC) AutoConnectTimer);
}

int metadataInterval = atoi(gMain.externalInterval);
Expand Down Expand Up @@ -1531,7 +1530,7 @@ void CMainWindow::OnDestroy() {
void CMainWindow::OnAboutAbout() {

/* TODO: Add your command handler code here */
aboutBox->m_Version = "Built on : "__DATE__ " "__TIME__;
aboutBox->m_Version = "Built on " __DATE__ __TIME__;
aboutBox->UpdateData(FALSE);
aboutBox->ShowWindow(SW_SHOW);
}
Expand All @@ -1556,6 +1555,11 @@ void CMainWindow::OnPaint() {

void CMainWindow::OnTimer(UINT nIDEvent) {

if (!BASS_ChannelIsActive(inRecHandle)) {
stopRecording();
startRecording(m_CurrentInputCard);
}

/* TODO: Add your message handler code here and/or call default */
if(nIDEvent == 73) {
int a = 0;
Expand Down
10 changes: 8 additions & 2 deletions trunk/AltaCast/src/altacastStandalone.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,23 @@
<ProjectGuid>{F2EB751E-9592-4064-9432-617FB1C45D25}</ProjectGuid>
<RootNamespace>altacastStandalone</RootNamespace>
<Keyword>MFCProj</Keyword>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -47,7 +53,7 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\release</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
Expand Down Expand Up @@ -123,7 +129,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>../;../../external/include;libaltacast;libaltacast_config;libtranscoder;FlexMeter;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WINVER=0x0500;WIN32;NDEBUG;_WINDOWS;HAVE_FAAC;HAVE_LAME;HAVE_VORBIS;ALTACASTSTANDALONE;HAVE_AACP;HAVE_FLAC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;_CRT_SECURE_NO_WARNINGS;WINVER=0x0501;WIN32;NDEBUG;_WINDOWS;HAVE_FAAC;HAVE_LAME;HAVE_VORBIS;ALTACASTSTANDALONE;HAVE_AACP;HAVE_FLAC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down
20 changes: 13 additions & 7 deletions trunk/AltaCast/src/libaltacast/libaltacast.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ void closeArchiveFile(altacastGlobals *g) {
}
}


int openArchiveFile(altacastGlobals *g) {
char_t outFilename[1024] = "";
char_t outputFile[1024] = "";
Expand Down Expand Up @@ -578,6 +579,7 @@ int sendToServer(altacastGlobals *g, int sd, char_t *data, int length, int type)
if(g->gSaveFile) {
if(!g->gSaveAsWAV) {
fwrite(data, length, 1, g->gSaveFile);
fflush(g->gSaveFile);
}
}
}
Expand Down Expand Up @@ -1163,7 +1165,7 @@ int updateSongTitle(altacastGlobals *g, int forceURL) {
if(getIsConnected(g)) {
if((!g->gOggFlag) || (forceURL)) {
if((g->gSCFlag) || (g->gIcecastFlag) || (g->gIcecast2Flag) || forceURL) {
URLize(g->gPassword, URLPassword, sizeof(g->gPassword), sizeof(URLPassword));
//URLize(g->gPassword, URLPassword, sizeof(g->gPassword), sizeof(URLPassword));

strcpy(g->gCurrentSong, g->gSongTitle);

Expand All @@ -1179,7 +1181,7 @@ int updateSongTitle(altacastGlobals *g, int forceURL) {
if(puserAuthbase64) {
sprintf(contentString,
"GET /admin/metadata?pass=%s&mode=updinfo&mount=%s&song=%s HTTP/1.0\r\nAuthorization: Basic %s\r\nUser-Agent: (Mozilla Compatible)\r\n\r\n",
URLPassword,
g->gPassword,
g->gMountpoint,
URLSong,
puserAuthbase64);
Expand All @@ -1190,15 +1192,15 @@ int updateSongTitle(altacastGlobals *g, int forceURL) {
if(g->gIcecastFlag) {
sprintf(contentString,
"GET /admin.cgi?pass=%s&mode=updinfo&mount=%s&song=%s HTTP/1.0\r\nUser-Agent: (Mozilla Compatible)\r\n\r\n",
URLPassword,
g->gPassword,
g->gMountpoint,
URLSong);
}

if(g->gSCFlag) {
sprintf(contentString,
"GET /admin.cgi?pass=%s&mode=updinfo&song=%s HTTP/1.0\r\nUser-Agent: (Mozilla Compatible)\r\n\r\n",
URLPassword,
g->gPassword,
URLSong);
}

Expand Down Expand Up @@ -2321,14 +2323,18 @@ out http://www.rarewares.org/mp3-lame-bundle.php");
vorbis_comment_add(&vc, artist);
#endif
}

sprintf(Streamed, "ENCODEDBY=altacast");
time_t now = time(0);
struct tm tstruct;
char buf[80];
tstruct = *localtime(&now);
strftime(buf, sizeof(buf), "%Y-%m-%d.%X", &tstruct);
sprintf(Streamed, "ENCODEDBY=altacast-%s",buf);
vorbis_comment_add(&vc, Streamed);
if(strlen(g->sourceDescription) > 0) {
sprintf(Streamed, "TRANSCODEDFROM=%s", g->sourceDescription);
vorbis_comment_add(&vc, Streamed);
}

OutputDebugString(Streamed);
/* Build the packets */
memset(&header_main, '\000', sizeof(header_main));
memset(&header_comments, '\000', sizeof(header_comments));
Expand Down
4 changes: 3 additions & 1 deletion trunk/AltaCast/src/libaltacast/libaltacast.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -56,7 +58,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>../../../external/include;../../external/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WINVER=0x0400;WIN32;NDEBUG;_LIB;HAVE_VORBIS;HAVE_LAME;HAVE_FAAC;HAVE_AACP;HAVE_FLAC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;_CRT_SECURE_NO_WARNINGS;WINVER=0x0400;WIN32;NDEBUG;_LIB;HAVE_VORBIS;HAVE_LAME;HAVE_FAAC;HAVE_AACP;HAVE_FLAC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down
Binary file modified trunk/external/lib/bass.dll
View file
Open in desktop
Binary file not shown.
Binary file modified trunk/external/lib/bass.lib
View file
Open in desktop
Binary file not shown.