Get rid of mmd->filename.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index ab88b07fbd60827e56299c2338acc7cb9e3a541d..c7760de1167e56bc1388f05da46aeb2d2999944e 100644 (file)
--- a/server.c
+++ b/server.c
@@ -22,7 +22,6 @@
 #include "para.h"
 #include "error.h"
 #include "server.cmdline.h"
 #include "para.h"
 #include "error.h"
 #include "server.cmdline.h"

-#include "afs_common.h"

 #include "afh.h"
 #include "string.h"
 #include "afs.h"
 #include "afh.h"
 #include "string.h"
 #include "afs.h"


@@ -148,14 +147,12 @@ static void shm_init(void)
                goto err_out;
        mmd_mutex = ret;
 
                goto err_out;
        mmd_mutex = ret;
 

-       mmd->selector_num = 0;

        mmd->num_played = 0;
        mmd->num_commands = 0;
        mmd->events = 0;
        mmd->num_connects = 0;
        mmd->active_connections = 0;
        mmd->num_played = 0;
        mmd->num_commands = 0;
        mmd->events = 0;
        mmd->num_connects = 0;
        mmd->active_connections = 0;

-       strcpy(mmd->filename, "(none)");
-       mmd->audio_format = -1;
+       strcpy(mmd->afd.path, "(none)");

        mmd->vss_status_flags = VSS_NEXT;
        mmd->new_vss_status_flags = VSS_NEXT;
        mmd->sender_cmd_data.cmd_num = -1;
        mmd->vss_status_flags = VSS_NEXT;
        mmd->new_vss_status_flags = VSS_NEXT;
        mmd->sender_cmd_data.cmd_num = -1;


@@ -345,8 +342,6 @@ static unsigned do_inits(int argc, char **argv)
        /* become daemon */
        if (conf.daemon_given)
                daemon_init();
        /* become daemon */
        if (conf.daemon_given)
                daemon_init();

-//     init_selector();
-//     PARA_ERROR_LOG("num: %d\n", mmd->selector_num);

        PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
        afh_init();
        vss_init();
        PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
        afh_init();
        vss_init();


@@ -392,8 +387,8 @@ out:
        prev_events = mmd->events;
        mmd->vss_status_flags = mmd->new_vss_status_flags;
        if (ret) {
        prev_events = mmd->events;
        mmd->vss_status_flags = mmd->new_vss_status_flags;
        if (ret) {

-               PARA_DEBUG_LOG("%d events, forcing status update, af = %d\n",
-                       mmd->events, mmd->audio_format);
+               PARA_DEBUG_LOG("%d events, forcing status update\n",
+                       mmd->events);

                killpg(0, SIGUSR1);
        }
 }
                killpg(0, SIGUSR1);
        }
 }