old session management code update

3 files changed, 15 insertions, 60 deletions

diff --git a/main.c b/main.c
index fc116221..da0423eb 100644
--- a/main.c
+++ b/main.c
@@ -68,7 +68,6 @@
 char confdir[1024]; // $HOME/.config
 char dbconfdir[1024]; // $HOME/.config/deadbeef
 char defpl[1024]; // $HOME/.config/deadbeef/default.dbpl
-char sessfile[1024]; // $HOME/.config/deadbeef/session
 
 // client-side commandline support
 // -1 error, program must exit with error code -1
@@ -448,10 +447,6 @@ main (int argc, char *argv[]) {
         fprintf (stderr, "fatal: out of memory while configuring\n");
         return -1;
     }
-    if (snprintf (sessfile, sizeof (sessfile), "%s/deadbeef/session", confdir) > sizeof (sessfile)) {
-        fprintf (stderr, "fatal: out of memory while configuring\n");
-        return -1;
-    }
     mkdir (confdir, 0755);
     if (snprintf (dbconfdir, sizeof (dbconfdir), "%s/deadbeef", confdir) > sizeof (dbconfdir)) {
         fprintf (stderr, "fatal: out of memory while configuring\n");
@@ -608,7 +603,15 @@ main (int argc, char *argv[]) {
         pl_load (defpl);
     }
     plug_trigger_event_playlistchanged ();
-    session_load (sessfile);
+
+// this is old code left for backwards compatibility
+    {
+        char sessfile[1024]; // $HOME/.config/deadbeef/session
+        if (snprintf (sessfile, sizeof (sessfile), "%s/deadbeef/session", confdir) < sizeof (sessfile)) {
+            session_load (sessfile);
+        }
+    }
+
     codec_init_locking ();
     streamer_init ();
 
@@ -618,6 +621,12 @@ main (int argc, char *argv[]) {
     // save config
     pl_save (defpl);
     conf_save ();
+    {
+        char sessfile[1024]; // $HOME/.config/deadbeef/session
+        if (snprintf (sessfile, sizeof (sessfile), "%s/deadbeef/session", confdir) < sizeof (sessfile)) {
+            unlink (sessfile);
+        }
+    }
 
     // stop receiving messages from outside
     server_close ();
@@ -634,7 +643,6 @@ main (int argc, char *argv[]) {
 
     // at this point we can simply do exit(0), but let's clean up for debugging
     codec_free_locking ();
-    session_save (sessfile);
     pl_free ();
     conf_free ();
     messagepump_free ();
diff --git a/session.c b/session.c
index 58ecb6d7..4be42deb 100644
--- a/session.c
+++ b/session.c
@@ -118,56 +118,6 @@ read_i32_be (uint32_t *pval, FILE *fp) {
 }
 
 int
-session_save (const char *fname) {
-    unlink (fname);
-#if 0
-    FILE *fp = fopen (fname, "w+b");
-    if (!fp) {
-        fprintf (stderr, "failed to save session, file %s could not be opened\n");
-        return -1;
-    }
-    // magic
-    if (fwrite (sessfile_magic, 1, 4, fp) != 4) {
-        goto session_save_fail;
-    }
-    uint8_t version = SESS_CURRENT_VER;
-    if (fwrite (&version, 1, 1, fp) != 1) {
-        goto session_save_fail;
-    }
-    uint16_t l = strlen (session_dir);
-    if (write_i16_be (l, fp) != 2) {
-        goto session_save_fail;
-    }
-    if (fwrite (session_dir, 1, l, fp) != l) {
-        goto session_save_fail;
-    }
-    if (write_i32_be (*((uint32_t*)&session_volume), fp) != 4) {
-        goto session_save_fail;
-    }
-    if (fwrite (&session_playlist_order, 1, 1, fp) != 1) {
-        goto session_save_fail;
-    }
-    if (fwrite (&session_playlist_looping, 1, 1, fp) != 1) {
-        goto session_save_fail;
-    }
-    if (fwrite (&session_scroll_follows_playback, 1, 1, fp) != 1) {
-        goto session_save_fail;
-    }
-    for (int k = 0; k < 5; k++) {
-        if (write_i32_be (session_win_attrs[k], fp) != 4) {
-            goto session_save_fail;
-        }
-    }
-    fclose (fp);
-    return 0;
-session_save_fail:
-    fprintf (stderr, "failed to save session, seems to be a disk error\n");
-    fclose (fp);
-    return -1;
-#endif
-}
-
-int
 session_load (const char *fname) {
     char session_dir[2048];
     float session_volume;
diff --git a/session.h b/session.h
index a1c04744..92b605e8 100644
--- a/session.h
+++ b/session.h
@@ -22,9 +22,6 @@
 #include <stdint.h>
 
 int
-session_save (const char *fname);
-
-int
 session_load (const char *fname);
 
 #endif // __SESSION_H